郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 0d0aca4c530f7877689f8052596ccb70ea43d679 1 个父辈 aacd70a3
1 个管道 的构建 通过 耗费 9 秒

修改后台图片类型

内嵌 并排对比
正在显示 17 个修改的文件 包含 649 行增加 和 307 行删除
@@ -2,22 +2,15 @@ @@ -2,22 +2,15 @@
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" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Pic.php" afterPath="$PROJECT_DIR$/application/admin/controller/Pic.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Pic.php" afterPath="$PROJECT_DIR$/application/admin/controller/Pic.php" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" afterPath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />  
8 <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/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />  
11 <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/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" /> 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />  
15 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />  
16 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" /> 10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/type/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/type/edit.html" />
17 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
18 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" /> 13 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
19 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />  
20 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />  
21 </list> 14 </list>
22 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
23 <option name="TRACKING_ENABLED" value="true" /> 16 <option name="TRACKING_ENABLED" value="true" />
@@ -27,7 +20,66 @@ @@ -27,7 +20,66 @@
27 <option name="LAST_RESOLUTION" value="IGNORE" /> 20 <option name="LAST_RESOLUTION" value="IGNORE" />
28 </component> 21 </component>
29 <component name="FileEditorManager"> 22 <component name="FileEditorManager">
30 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> 23 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  24 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
  25 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  26 + <provider selected="true" editor-type-id="text-editor">
  27 + <state relative-caret-position="63">
  28 + <caret line="172" column="7" lean-forward="false" selection-start-line="172" selection-start-column="7" selection-end-line="172" selection-end-column="7" />
  29 + <folding>
  30 + <element signature="e#2902#3430#0#PHP" expanded="false" />
  31 + <element signature="e#3435#4571#0#PHP" expanded="false" />
  32 + <element signature="e#4577#4984#0#PHP" expanded="false" />
  33 + <element signature="e#4989#5332#0#PHP" expanded="false" />
  34 + <element signature="e#5338#5751#0#PHP" expanded="false" />
  35 + <element signature="e#6112#6949#0#PHP" expanded="false" />
  36 + <element signature="e#6954#9149#0#PHP" expanded="false" />
  37 + <element signature="e#9155#9800#0#PHP" expanded="false" />
  38 + <element signature="e#22993#23498#0#PHP" expanded="false" />
  39 + <element signature="e#23503#23754#0#PHP" expanded="false" />
  40 + <element signature="e#23760#24239#0#PHP" expanded="false" />
  41 + <element signature="e#24244#25001#0#PHP" expanded="false" />
  42 + <element signature="e#25007#25488#0#PHP" expanded="false" />
  43 + <element signature="e#25493#26263#0#PHP" expanded="false" />
  44 + <element signature="e#26269#26632#0#PHP" expanded="false" />
  45 + <element signature="e#26637#26828#0#PHP" expanded="false" />
  46 + <element signature="e#26834#27192#0#PHP" expanded="false" />
  47 + <element signature="e#27197#27388#0#PHP" expanded="false" />
  48 + <element signature="e#27394#28537#0#PHP" expanded="false" />
  49 + <element signature="e#28542#31207#0#PHP" expanded="false" />
  50 + <element signature="e#31213#31711#0#PHP" expanded="false" />
  51 + <element signature="e#31716#33462#0#PHP" expanded="false" />
  52 + <element signature="e#33468#33881#0#PHP" expanded="false" />
  53 + <element signature="e#33886#34365#0#PHP" expanded="false" />
  54 + <element signature="e#34371#34905#0#PHP" expanded="false" />
  55 + <element signature="e#34910#36295#0#PHP" expanded="false" />
  56 + <element signature="e#36301#36955#0#PHP" expanded="false" />
  57 + <element signature="e#36960#38975#0#PHP" expanded="false" />
  58 + <element signature="e#38981#39741#0#PHP" expanded="false" />
  59 + <element signature="e#39746#42455#0#PHP" expanded="false" />
  60 + <element signature="e#42481#43312#0#PHP" expanded="false" />
  61 + <element signature="e#43318#43738#0#PHP" expanded="false" />
  62 + <element signature="e#43743#44226#0#PHP" expanded="false" />
  63 + <element signature="e#44232#45038#0#PHP" expanded="false" />
  64 + <element signature="e#45043#48197#0#PHP" expanded="false" />
  65 + <element signature="e#48212#49540#0#PHP" expanded="false" />
  66 + <element signature="e#49556#50583#0#PHP" expanded="false" />
  67 + <element signature="e#50589#51347#0#PHP" expanded="false" />
  68 + <element signature="e#51352#55095#0#PHP" expanded="false" />
  69 + <element signature="e#55101#55493#0#PHP" expanded="false" />
  70 + <element signature="e#55498#56450#0#PHP" expanded="false" />
  71 + <element signature="e#56474#57047#0#PHP" expanded="false" />
  72 + <element signature="e#57053#57652#0#PHP" expanded="false" />
  73 + <element signature="e#57657#58584#0#PHP" expanded="false" />
  74 + <element signature="e#58590#59304#0#PHP" expanded="false" />
  75 + <element signature="e#59310#59737#0#PHP" expanded="false" />
  76 + <element signature="e#59742#60211#0#PHP" expanded="false" />
  77 + </folding>
  78 + </state>
  79 + </provider>
  80 + </entry>
  81 + </file>
  82 + </leaf>
31 </component> 83 </component>
32 <component name="FindInProjectRecents"> 84 <component name="FindInProjectRecents">
33 <findStrings> 85 <findStrings>
@@ -45,12 +97,6 @@ @@ -45,12 +97,6 @@
45 <component name="IdeDocumentHistory"> 97 <component name="IdeDocumentHistory">
46 <option name="CHANGED_PATHS"> 98 <option name="CHANGED_PATHS">
47 <list> 99 <list>
48 - <option value="$PROJECT_DIR$/application/admin/view/video/index.html" />  
49 - <option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" />  
50 - <option value="$PROJECT_DIR$/public/assets/js/backend/type.js" />  
51 - <option value="$PROJECT_DIR$/application/admin/view/type/add.html" />  
52 - <option value="$PROJECT_DIR$/application/admin/view/type/index.html" />  
53 - <option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />  
54 <option value="$PROJECT_DIR$/application/admin/model/Pic.php" /> 100 <option value="$PROJECT_DIR$/application/admin/model/Pic.php" />
55 <option value="$PROJECT_DIR$/application/admin/model/Type.php" /> 101 <option value="$PROJECT_DIR$/application/admin/model/Type.php" />
56 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" /> 102 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" />
@@ -80,12 +126,6 @@ @@ -80,12 +126,6 @@
80 <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> 126 <option value="$PROJECT_DIR$/application/nsms/nsms.php" />
81 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 127 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
82 <option value="$PROJECT_DIR$/application/extra/verify.php" /> 128 <option value="$PROJECT_DIR$/application/extra/verify.php" />
83 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
84 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />  
85 - <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />  
86 - <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />  
87 - <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />  
88 - <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />  
89 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" /> 129 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
90 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 130 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
91 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" /> 131 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
@@ -96,6 +136,18 @@ @@ -96,6 +136,18 @@
96 <option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" /> 136 <option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
97 <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" /> 137 <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
98 <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" /> 138 <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
  139 + <option value="$PROJECT_DIR$/application/admin/view/pictype/add.html" />
  140 + <option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />
  141 + <option value="$PROJECT_DIR$/application/admin/view/pictype/edit.html" />
  142 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php" />
  143 + <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
  144 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
  145 + <option value="$PROJECT_DIR$/application/admin/model/Pictype.php" />
  146 + <option value="$PROJECT_DIR$/public/assets/js/backend/pictype.js" />
  147 + <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
  148 + <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
  149 + <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
  150 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
99 </list> 151 </list>
100 </option> 152 </option>
101 </component> 153 </component>
@@ -113,11 +165,11 @@ @@ -113,11 +165,11 @@
113 <sorting>DEFINITION_ORDER</sorting> 165 <sorting>DEFINITION_ORDER</sorting>
114 </component> 166 </component>
115 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 167 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
116 - <component name="ProjectFrameBounds" extendedState="1">  
117 - <option name="x" value="42" />  
118 - <option name="y" value="112" />  
119 - <option name="width" value="1907" />  
120 - <option name="height" value="943" /> 168 + <component name="ProjectFrameBounds">
  169 + <option name="x" value="319" />
  170 + <option name="y" value="56" />
  171 + <option name="width" value="1700" />
  172 + <option name="height" value="1000" />
121 </component> 173 </component>
122 <component name="ProjectView"> 174 <component name="ProjectView">
123 <navigator currentView="ProjectPane" proportions="" version="1"> 175 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -134,7 +186,6 @@ @@ -134,7 +186,6 @@
134 <foldersAlwaysOnTop value="true" /> 186 <foldersAlwaysOnTop value="true" />
135 </navigator> 187 </navigator>
136 <panes> 188 <panes>
137 - <pane id="Scratches" />  
138 <pane id="ProjectPane"> 189 <pane id="ProjectPane">
139 <subPane> 190 <subPane>
140 <expand> 191 <expand>
@@ -151,39 +202,21 @@ @@ -151,39 +202,21 @@
151 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 202 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
152 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 203 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
153 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 204 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
154 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />  
155 - </path>  
156 - <path>  
157 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
158 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
159 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 205 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
160 </path> 206 </path>
161 <path> 207 <path>
162 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 208 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
163 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 209 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
164 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
165 - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />  
166 - </path>  
167 - <path>  
168 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
169 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
170 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
171 - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />  
172 - <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />  
173 - </path>  
174 - <path>  
175 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
176 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
177 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
178 - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />  
179 - <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />  
180 - <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" /> 210 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  211 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  212 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
181 </path> 213 </path>
182 </expand> 214 </expand>
183 <select /> 215 <select />
184 </subPane> 216 </subPane>
185 </pane> 217 </pane>
186 <pane id="Scope" /> 218 <pane id="Scope" />
  219 + <pane id="Scratches" />
187 </panes> 220 </panes>
188 </component> 221 </component>
189 <component name="PropertiesComponent"> 222 <component name="PropertiesComponent">
@@ -256,7 +289,15 @@ @@ -256,7 +289,15 @@
256 <workItem from="1575340427887" duration="256000" /> 289 <workItem from="1575340427887" duration="256000" />
257 <workItem from="1575420983161" duration="9911000" /> 290 <workItem from="1575420983161" duration="9911000" />
258 <workItem from="1575444277051" duration="130000" /> 291 <workItem from="1575444277051" duration="130000" />
259 - <workItem from="1575457595017" duration="3691000" /> 292 + <workItem from="1575457595017" duration="3898000" />
  293 + <workItem from="1575462829570" duration="262000" />
  294 + <workItem from="1575505399026" duration="2520000" />
  295 + <workItem from="1575527050192" duration="243000" />
  296 + <workItem from="1575538373568" duration="280000" />
  297 + <workItem from="1575541798312" duration="2359000" />
  298 + <workItem from="1575592025964" duration="640000" />
  299 + <workItem from="1575599624364" duration="95000" />
  300 + <workItem from="1575680867057" duration="4648000" />
260 </task> 301 </task>
261 <task id="LOCAL-00001" summary="调试"> 302 <task id="LOCAL-00001" summary="调试">
262 <created>1574145133364</created> 303 <created>1574145133364</created>
@@ -269,7 +310,7 @@ @@ -269,7 +310,7 @@
269 <servers /> 310 <servers />
270 </component> 311 </component>
271 <component name="TimeTrackingManager"> 312 <component name="TimeTrackingManager">
272 - <option name="totallyTimeSpent" value="303293000" /> 313 + <option name="totallyTimeSpent" value="314547000" />
273 </component> 314 </component>
274 <component name="TodoView"> 315 <component name="TodoView">
275 <todo-panel id="selected-file"> 316 <todo-panel id="selected-file">
@@ -281,16 +322,16 @@ @@ -281,16 +322,16 @@
281 </todo-panel> 322 </todo-panel>
282 </component> 323 </component>
283 <component name="ToolWindowManager"> 324 <component name="ToolWindowManager">
284 - <frame x="42" y="112" width="1907" height="943" extended-state="1" /> 325 + <frame x="319" y="56" width="1700" height="1000" extended-state="0" />
285 <layout> 326 <layout>
286 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1575528" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 327 + <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" />
287 <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" /> 328 <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" />
288 <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" /> 329 <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" />
289 <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" /> 330 <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" />
290 <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" /> 331 <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" />
291 <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" /> 332 <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" />
292 <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" /> 333 <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" />
293 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.10361446" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 334 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.10428737" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
294 <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" /> 335 <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" />
295 <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" /> 336 <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" />
296 <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" /> 337 <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" />
@@ -333,103 +374,11 @@ @@ -333,103 +374,11 @@
333 </component> 374 </component>
334 <component name="XDebuggerManager"> 375 <component name="XDebuggerManager">
335 <breakpoint-manager> 376 <breakpoint-manager>
336 - <option name="time" value="12" /> 377 + <option name="time" value="16" />
337 </breakpoint-manager> 378 </breakpoint-manager>
338 <watches-manager /> 379 <watches-manager />
339 </component> 380 </component>
340 <component name="editorHistoryManager"> 381 <component name="editorHistoryManager">
341 - <entry file="file://$PROJECT_DIR$/extend/nsms/nsms.php" />  
342 - <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">  
343 - <provider selected="true" editor-type-id="text-editor">  
344 - <state relative-caret-position="125">  
345 - <caret line="5" column="17" lean-forward="true" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />  
346 - </state>  
347 - </provider>  
348 - </entry>  
349 - <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Order/Client.php">  
350 - <provider selected="true" editor-type-id="text-editor">  
351 - <state relative-caret-position="307">  
352 - <caret line="34" column="20" lean-forward="false" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />  
353 - </state>  
354 - </provider>  
355 - </entry>  
356 - <entry file="file://$PROJECT_DIR$/public/cert/证书使用说明.txt">  
357 - <provider selected="true" editor-type-id="text-editor">  
358 - <state relative-caret-position="0">  
359 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
360 - </state>  
361 - </provider>  
362 - </entry>  
363 - <entry file="file://$PROJECT_DIR$/public/cert/apiclient_key.pem">  
364 - <provider selected="true" editor-type-id="text-editor">  
365 - <state relative-caret-position="0">  
366 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
367 - </state>  
368 - </provider>  
369 - </entry>  
370 - <entry file="file://$PROJECT_DIR$/public/cert/apiclient_cert.pem">  
371 - <provider selected="true" editor-type-id="text-editor">  
372 - <state relative-caret-position="0">  
373 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
374 - </state>  
375 - </provider>  
376 - </entry>  
377 - <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">  
378 - <provider selected="true" editor-type-id="text-editor">  
379 - <state relative-caret-position="306">  
380 - <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />  
381 - </state>  
382 - </provider>  
383 - </entry>  
384 - <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Reverse/Client.php">  
385 - <provider selected="true" editor-type-id="text-editor">  
386 - <state relative-caret-position="200">  
387 - <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />  
388 - </state>  
389 - </provider>  
390 - </entry>  
391 - <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Factory.php">  
392 - <provider selected="true" editor-type-id="text-editor">  
393 - <state relative-caret-position="170">  
394 - <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />  
395 - </state>  
396 - </provider>  
397 - </entry>  
398 - <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php">  
399 - <provider selected="true" editor-type-id="text-editor">  
400 - <state relative-caret-position="531">  
401 - <caret line="79" column="0" lean-forward="true" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />  
402 - </state>  
403 - </provider>  
404 - </entry>  
405 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">  
406 - <provider selected="true" editor-type-id="text-editor">  
407 - <state relative-caret-position="175">  
408 - <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />  
409 - </state>  
410 - </provider>  
411 - </entry>  
412 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">  
413 - <provider selected="true" editor-type-id="text-editor">  
414 - <state relative-caret-position="150">  
415 - <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />  
416 - </state>  
417 - </provider>  
418 - </entry>  
419 - <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">  
420 - <provider selected="true" editor-type-id="text-editor">  
421 - <state relative-caret-position="203">  
422 - <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />  
423 - </state>  
424 - </provider>  
425 - </entry>  
426 - <entry file="file://$PROJECT_DIR$/application/admin/validate/Vip.php">  
427 - <provider selected="true" editor-type-id="text-editor">  
428 - <state relative-caret-position="0">  
429 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
430 - </state>  
431 - </provider>  
432 - </entry>  
433 <entry file="file://$PROJECT_DIR$/application/admin/model/Vip.php"> 382 <entry file="file://$PROJECT_DIR$/application/admin/model/Vip.php">
434 <provider selected="true" editor-type-id="text-editor"> 383 <provider selected="true" editor-type-id="text-editor">
435 <state relative-caret-position="0"> 384 <state relative-caret-position="0">
@@ -458,13 +407,7 @@ @@ -458,13 +407,7 @@
458 </state> 407 </state>
459 </provider> 408 </provider>
460 </entry> 409 </entry>
461 - <entry file="file://$USER_HOME$/Desktop/1.html">  
462 - <provider selected="true" editor-type-id="text-editor">  
463 - <state relative-caret-position="80">  
464 - <caret line="5" column="114" lean-forward="true" selection-start-line="5" selection-start-column="114" selection-end-line="5" selection-end-column="114" />  
465 - </state>  
466 - </provider>  
467 - </entry> 410 + <entry file="file://$USER_HOME$/Desktop/1.html" />
468 <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html"> 411 <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
469 <provider selected="true" editor-type-id="text-editor"> 412 <provider selected="true" editor-type-id="text-editor">
470 <state relative-caret-position="325"> 413 <state relative-caret-position="325">
@@ -507,44 +450,6 @@ @@ -507,44 +450,6 @@
507 </state> 450 </state>
508 </provider> 451 </provider>
509 </entry> 452 </entry>
510 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">  
511 - <provider selected="true" editor-type-id="text-editor">  
512 - <state relative-caret-position="381">  
513 - <caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />  
514 - <folding>  
515 - <element signature="e#38#68#0#PHP" expanded="false" />  
516 - <element signature="e#574#693#0#PHP" expanded="false" />  
517 - <element signature="e#699#1012#0#PHP" expanded="false" />  
518 - <element signature="e#1017#3093#0#PHP" expanded="false" />  
519 - <element signature="e#3099#3419#0#PHP" expanded="false" />  
520 - <element signature="e#3424#5506#0#PHP" expanded="false" />  
521 - <element signature="e#5512#5930#0#PHP" expanded="false" />  
522 - <element signature="e#6179#6269#0#PHP" expanded="false" />  
523 - <element signature="e#6347#6443#0#PHP" expanded="false" />  
524 - <element signature="e#7641#7929#0#PHP" expanded="false" />  
525 - <element signature="e#8006#8279#0#PHP" expanded="false" />  
526 - <element signature="e#11461#13236#0#PHP" expanded="false" />  
527 - <element signature="e#13309#13729#0#PHP" expanded="false" />  
528 - <element signature="e#15368#15656#0#PHP" expanded="false" />  
529 - <element signature="e#15732#16005#0#PHP" expanded="false" />  
530 - <element signature="e#16160#16470#0#PHP" expanded="false" />  
531 - <element signature="e#16545#16996#0#PHP" expanded="false" />  
532 - <element signature="e#17073#18117#0#PHP" expanded="false" />  
533 - <element signature="e#18211#18329#0#PHP" expanded="false" />  
534 - <element signature="e#21048#21345#0#PHP" expanded="false" />  
535 - <element signature="e#21350#21743#0#PHP" expanded="false" />  
536 - <element signature="e#21770#25248#0#PHP" expanded="false" />  
537 - <element signature="e#25277#28182#0#PHP" expanded="false" />  
538 - <element signature="e#28211#31661#0#PHP" expanded="false" />  
539 - <element signature="e#29087#29692#0#PHP" expanded="false" />  
540 - <element signature="e#29713#31150#0#PHP" expanded="false" />  
541 - <element signature="e#31198#31300#0#PHP" expanded="false" />  
542 - <element signature="e#31690#35427#0#PHP" expanded="false" />  
543 - <element signature="e#35450#35667#0#PHP" expanded="false" />  
544 - </folding>  
545 - </state>  
546 - </provider>  
547 - </entry>  
548 <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> 453 <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
549 <provider selected="true" editor-type-id="text-editor"> 454 <provider selected="true" editor-type-id="text-editor">
550 <state relative-caret-position="450"> 455 <state relative-caret-position="450">
@@ -605,201 +510,320 @@ @@ -605,201 +510,320 @@
605 <provider selected="true" editor-type-id="text-editor"> 510 <provider selected="true" editor-type-id="text-editor">
606 <state relative-caret-position="267"> 511 <state relative-caret-position="267">
607 <caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" /> 512 <caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
608 - <folding />  
609 </state> 513 </state>
610 </provider> 514 </provider>
611 </entry> 515 </entry>
612 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 516 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
  517 + <provider selected="true" editor-type-id="text-editor">
  518 + <state relative-caret-position="125">
  519 + <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
  520 + </state>
  521 + </provider>
  522 + </entry>
  523 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
  524 + <provider selected="true" editor-type-id="text-editor">
  525 + <state relative-caret-position="475">
  526 + <caret line="20" column="43" lean-forward="false" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
  527 + </state>
  528 + </provider>
  529 + </entry>
  530 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
  531 + <provider selected="true" editor-type-id="text-editor">
  532 + <state relative-caret-position="236">
  533 + <caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
  534 + </state>
  535 + </provider>
  536 + </entry>
  537 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
613 <provider selected="true" editor-type-id="text-editor"> 538 <provider selected="true" editor-type-id="text-editor">
614 - <state relative-caret-position="357">  
615 - <caret line="437" column="7" lean-forward="true" selection-start-line="437" selection-start-column="7" selection-end-line="437" selection-end-column="7" /> 539 + <state relative-caret-position="125">
  540 + <caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
  541 + </state>
  542 + </provider>
  543 + </entry>
  544 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  545 + <provider selected="true" editor-type-id="text-editor">
  546 + <state relative-caret-position="175">
  547 + <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
  548 + </state>
  549 + </provider>
  550 + </entry>
  551 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
  552 + <provider selected="true" editor-type-id="text-editor">
  553 + <state relative-caret-position="175">
  554 + <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
  555 + </state>
  556 + </provider>
  557 + </entry>
  558 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
  559 + <provider selected="true" editor-type-id="text-editor">
  560 + <state relative-caret-position="125">
  561 + <caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
  562 + </state>
  563 + </provider>
  564 + </entry>
  565 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
  566 + <provider selected="true" editor-type-id="text-editor">
  567 + <state relative-caret-position="300">
  568 + <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
  569 + </state>
  570 + </provider>
  571 + </entry>
  572 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
  573 + <provider selected="true" editor-type-id="text-editor">
  574 + <state relative-caret-position="325">
  575 + <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
  576 + </state>
  577 + </provider>
  578 + </entry>
  579 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
  580 + <provider selected="true" editor-type-id="text-editor">
  581 + <state relative-caret-position="400">
  582 + <caret line="28" column="63" lean-forward="false" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
  583 + </state>
  584 + </provider>
  585 + </entry>
  586 + <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
  587 + <provider selected="true" editor-type-id="text-editor">
  588 + <state relative-caret-position="373">
  589 + <caret line="40" column="26" lean-forward="false" selection-start-line="40" selection-start-column="26" selection-end-line="40" selection-end-column="26" />
616 <folding> 590 <folding>
617 - <element signature="e#365#484#0#PHP" expanded="false" />  
618 - <element signature="e#490#1228#0#PHP" expanded="false" />  
619 - <element signature="e#1233#2896#0#PHP" expanded="false" />  
620 - <element signature="e#2902#3430#0#PHP" expanded="false" />  
621 - <element signature="e#3435#4571#0#PHP" expanded="false" />  
622 - <element signature="e#4577#4984#0#PHP" expanded="false" />  
623 - <element signature="e#4989#5332#0#PHP" expanded="false" />  
624 - <element signature="e#5338#6175#0#PHP" expanded="false" />  
625 - <element signature="e#6180#8375#0#PHP" expanded="false" />  
626 - <element signature="e#8381#9026#0#PHP" expanded="false" />  
627 - <element signature="e#9031#10127#0#PHP" expanded="false" />  
628 - <element signature="e#10133#10922#0#PHP" expanded="false" />  
629 - <element signature="e#10927#12275#0#PHP" expanded="false" />  
630 - <element signature="e#12281#12983#0#PHP" expanded="false" />  
631 - <element signature="e#12988#14188#0#PHP" expanded="false" />  
632 - <element signature="e#14194#14770#0#PHP" expanded="false" />  
633 - <element signature="e#14775#15336#0#PHP" expanded="false" />  
634 - <element signature="e#15342#16026#0#PHP" expanded="false" />  
635 - <element signature="e#16031#18127#0#PHP" expanded="false" />  
636 - <element signature="e#18133#19003#0#PHP" expanded="false" />  
637 - <element signature="e#19008#21504#0#PHP" expanded="false" />  
638 - <element signature="e#21510#21887#0#PHP" expanded="false" />  
639 - <element signature="e#21892#22213#0#PHP" expanded="false" />  
640 - <element signature="e#22219#22724#0#PHP" expanded="false" />  
641 - <element signature="e#22729#22980#0#PHP" expanded="false" />  
642 - <element signature="e#22986#23465#0#PHP" expanded="false" />  
643 - <element signature="e#23470#24227#0#PHP" expanded="false" />  
644 - <element signature="e#24233#24714#0#PHP" expanded="false" />  
645 - <element signature="e#24719#25489#0#PHP" expanded="false" />  
646 - <element signature="e#25495#25858#0#PHP" expanded="false" />  
647 - <element signature="e#25863#26054#0#PHP" expanded="false" />  
648 - <element signature="e#26060#26418#0#PHP" expanded="false" />  
649 - <element signature="e#26423#26614#0#PHP" expanded="false" />  
650 - <element signature="e#26620#27763#0#PHP" expanded="false" />  
651 - <element signature="e#27768#30433#0#PHP" expanded="false" />  
652 - <element signature="e#30439#30937#0#PHP" expanded="false" />  
653 - <element signature="e#30942#32688#0#PHP" expanded="false" />  
654 - <element signature="e#32694#33107#0#PHP" expanded="false" />  
655 - <element signature="e#33112#33591#0#PHP" expanded="false" />  
656 - <element signature="e#33597#34131#0#PHP" expanded="false" />  
657 - <element signature="e#34136#35521#0#PHP" expanded="false" />  
658 - <element signature="e#35527#36181#0#PHP" expanded="false" />  
659 - <element signature="e#36186#38201#0#PHP" expanded="false" />  
660 - <element signature="e#37224#37686#0#PHP" expanded="false" />  
661 - <element signature="e#38207#38967#0#PHP" expanded="false" />  
662 - <element signature="e#38972#41681#0#PHP" expanded="false" />  
663 - <element signature="e#41707#42538#0#PHP" expanded="false" />  
664 - <element signature="e#42544#42964#0#PHP" expanded="false" />  
665 - <element signature="e#42969#43452#0#PHP" expanded="false" />  
666 - <element signature="e#43458#44264#0#PHP" expanded="false" />  
667 - <element signature="e#44269#47423#0#PHP" expanded="false" />  
668 - <element signature="e#47438#48766#0#PHP" expanded="false" />  
669 - <element signature="e#48782#49809#0#PHP" expanded="false" />  
670 - <element signature="e#49815#50573#0#PHP" expanded="false" />  
671 - <element signature="e#50578#54321#0#PHP" expanded="false" />  
672 - <element signature="e#54327#54719#0#PHP" expanded="false" />  
673 - <element signature="e#54724#55676#0#PHP" expanded="false" />  
674 - <element signature="e#55700#56273#0#PHP" expanded="false" />  
675 - <element signature="e#56279#56878#0#PHP" expanded="false" />  
676 - <element signature="e#56883#57810#0#PHP" expanded="false" />  
677 - <element signature="e#57816#58530#0#PHP" expanded="false" />  
678 - <element signature="e#58536#58963#0#PHP" expanded="false" />  
679 - <element signature="e#58968#59437#0#PHP" expanded="false" /> 591 + <element signature="e#699#1012#0#PHP" expanded="false" />
  592 + <element signature="e#1017#3093#0#PHP" expanded="false" />
  593 + <element signature="e#3099#3419#0#PHP" expanded="false" />
  594 + <element signature="e#3424#5506#0#PHP" expanded="false" />
  595 + <element signature="e#5512#5930#0#PHP" expanded="false" />
  596 + <element signature="e#5935#13303#0#PHP" expanded="false" />
  597 + <element signature="e#13309#13729#0#PHP" expanded="false" />
  598 + <element signature="e#13734#21031#0#PHP" expanded="false" />
  599 + <element signature="e#21048#21345#0#PHP" expanded="false" />
  600 + <element signature="e#21350#21743#0#PHP" expanded="false" />
  601 + <element signature="e#21770#25248#0#PHP" expanded="false" />
  602 + <element signature="e#25277#28182#0#PHP" expanded="false" />
  603 + <element signature="e#28211#31661#0#PHP" expanded="false" />
  604 + <element signature="e#31690#35427#0#PHP" expanded="false" />
  605 + <element signature="e#35450#35667#0#PHP" expanded="false" />
680 </folding> 606 </folding>
681 </state> 607 </state>
682 </provider> 608 </provider>
683 </entry> 609 </entry>
684 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"> 610 + <entry file="file://$PROJECT_DIR$/application/admin/view/type/add.html">
  611 + <provider selected="true" editor-type-id="text-editor">
  612 + <state relative-caret-position="175">
  613 + <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
  614 + <folding />
  615 + </state>
  616 + </provider>
  617 + </entry>
  618 + <entry file="file://$PROJECT_DIR$/application/admin/view/type/edit.html">
  619 + <provider selected="true" editor-type-id="text-editor">
  620 + <state relative-caret-position="200">
  621 + <caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="21" selection-end-column="10" />
  622 + <folding />
  623 + </state>
  624 + </provider>
  625 + </entry>
  626 + <entry file="file://$PROJECT_DIR$/application/admin/view/pictype/add.html">
685 <provider selected="true" editor-type-id="text-editor"> 627 <provider selected="true" editor-type-id="text-editor">
686 <state relative-caret-position="150"> 628 <state relative-caret-position="150">
687 - <caret line="6" column="26" lean-forward="false" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" /> 629 + <caret line="6" column="14" lean-forward="true" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
688 <folding /> 630 <folding />
689 </state> 631 </state>
690 </provider> 632 </provider>
691 </entry> 633 </entry>
692 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php"> 634 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/type.php">
693 <provider selected="true" editor-type-id="text-editor"> 635 <provider selected="true" editor-type-id="text-editor">
694 - <state relative-caret-position="400">  
695 - <caret line="20" column="45" lean-forward="true" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" /> 636 + <state relative-caret-position="100">
  637 + <caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="26" />
696 <folding /> 638 <folding />
697 </state> 639 </state>
698 </provider> 640 </provider>
699 </entry> 641 </entry>
700 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html"> 642 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php">
701 <provider selected="true" editor-type-id="text-editor"> 643 <provider selected="true" editor-type-id="text-editor">
702 - <state relative-caret-position="175">  
703 - <caret line="7" column="4" lean-forward="true" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" /> 644 + <state relative-caret-position="75">
  645 + <caret line="3" column="29" lean-forward="false" selection-start-line="3" selection-start-column="29" selection-end-line="3" selection-end-column="29" />
704 <folding /> 646 <folding />
705 </state> 647 </state>
706 </provider> 648 </provider>
707 </entry> 649 </entry>
708 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html"> 650 + <entry file="file://$PROJECT_DIR$/application/admin/view/pictype/edit.html">
709 <provider selected="true" editor-type-id="text-editor"> 651 <provider selected="true" editor-type-id="text-editor">
710 - <state relative-caret-position="175">  
711 - <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" /> 652 + <state relative-caret-position="525">
  653 + <caret line="21" column="10" lean-forward="false" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
712 <folding /> 654 <folding />
713 </state> 655 </state>
714 </provider> 656 </provider>
715 </entry> 657 </entry>
716 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js"> 658 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
717 <provider selected="true" editor-type-id="text-editor"> 659 <provider selected="true" editor-type-id="text-editor">
718 - <state relative-caret-position="409">  
719 - <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" /> 660 + <state relative-caret-position="250">
  661 + <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
720 <folding /> 662 <folding />
721 </state> 663 </state>
722 </provider> 664 </provider>
723 </entry> 665 </entry>
724 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"> 666 + <entry file="file://$PROJECT_DIR$/thinkphp/library/think/model/relation/OneToOne.php">
725 <provider selected="true" editor-type-id="text-editor"> 667 <provider selected="true" editor-type-id="text-editor">
726 - <state relative-caret-position="125">  
727 - <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" /> 668 + <state relative-caret-position="252">
  669 + <caret line="185" column="20" lean-forward="false" selection-start-line="185" selection-start-column="20" selection-end-line="185" selection-end-column="20" />
728 <folding /> 670 <folding />
729 </state> 671 </state>
730 </provider> 672 </provider>
731 </entry> 673 </entry>
732 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php"> 674 + <entry file="file://$PROJECT_DIR$/application/admin/model/Pic.php">
733 <provider selected="true" editor-type-id="text-editor"> 675 <provider selected="true" editor-type-id="text-editor">
734 - <state relative-caret-position="475">  
735 - <caret line="20" column="43" lean-forward="false" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" /> 676 + <state relative-caret-position="0">
  677 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
736 <folding /> 678 <folding />
737 </state> 679 </state>
738 </provider> 680 </provider>
739 </entry> 681 </entry>
740 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php"> 682 + <entry file="file://$PROJECT_DIR$/application/admin/model/Type.php">
741 <provider selected="true" editor-type-id="text-editor"> 683 <provider selected="true" editor-type-id="text-editor">
742 - <state relative-caret-position="236">  
743 - <caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" /> 684 + <state relative-caret-position="-27">
  685 + <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
744 <folding /> 686 <folding />
745 </state> 687 </state>
746 </provider> 688 </provider>
747 </entry> 689 </entry>
748 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php"> 690 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Type.php">
749 <provider selected="true" editor-type-id="text-editor"> 691 <provider selected="true" editor-type-id="text-editor">
750 - <state relative-caret-position="125">  
751 - <caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" /> 692 + <state relative-caret-position="-302">
  693 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
752 <folding /> 694 <folding />
753 </state> 695 </state>
754 </provider> 696 </provider>
755 </entry> 697 </entry>
756 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> 698 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pictype.php">
757 <provider selected="true" editor-type-id="text-editor"> 699 <provider selected="true" editor-type-id="text-editor">
758 - <state relative-caret-position="175">  
759 - <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" /> 700 + <state relative-caret-position="548">
  701 + <caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
760 <folding /> 702 <folding />
761 </state> 703 </state>
762 </provider> 704 </provider>
763 </entry> 705 </entry>
764 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html"> 706 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
765 <provider selected="true" editor-type-id="text-editor"> 707 <provider selected="true" editor-type-id="text-editor">
766 - <state relative-caret-position="175">  
767 - <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" /> 708 + <state relative-caret-position="349">
  709 + <caret line="52" column="39" lean-forward="true" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
768 <folding /> 710 <folding />
769 </state> 711 </state>
770 </provider> 712 </provider>
771 </entry> 713 </entry>
772 - <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html"> 714 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pictype.js">
773 <provider selected="true" editor-type-id="text-editor"> 715 <provider selected="true" editor-type-id="text-editor">
774 - <state relative-caret-position="125">  
775 - <caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" /> 716 + <state relative-caret-position="375">
  717 + <caret line="24" column="21" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="24" selection-end-column="21" />
776 <folding /> 718 <folding />
777 </state> 719 </state>
778 </provider> 720 </provider>
779 </entry> 721 </entry>
780 - <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html"> 722 + <entry file="file://$PROJECT_DIR$/application/admin/model/Pictype.php">
781 <provider selected="true" editor-type-id="text-editor"> 723 <provider selected="true" editor-type-id="text-editor">
782 - <state relative-caret-position="300">  
783 - <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" /> 724 + <state relative-caret-position="413">
  725 + <caret line="28" column="6" lean-forward="true" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
784 <folding /> 726 <folding />
785 </state> 727 </state>
786 </provider> 728 </provider>
787 </entry> 729 </entry>
788 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> 730 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">
789 <provider selected="true" editor-type-id="text-editor"> 731 <provider selected="true" editor-type-id="text-editor">
790 - <state relative-caret-position="325">  
791 - <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" /> 732 + <state relative-caret-position="475">
  733 + <caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
792 <folding /> 734 <folding />
793 </state> 735 </state>
794 </provider> 736 </provider>
795 </entry> 737 </entry>
796 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js"> 738 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
797 <provider selected="true" editor-type-id="text-editor"> 739 <provider selected="true" editor-type-id="text-editor">
798 - <state relative-caret-position="400">  
799 - <caret line="28" column="63" lean-forward="false" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" /> 740 + <state relative-caret-position="475">
  741 + <caret line="43" column="14" lean-forward="true" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="14" />
  742 + <folding />
  743 + </state>
  744 + </provider>
  745 + </entry>
  746 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
  747 + <provider selected="true" editor-type-id="text-editor">
  748 + <state relative-caret-position="338">
  749 + <caret line="134" column="9" lean-forward="true" selection-start-line="134" selection-start-column="9" selection-end-line="134" selection-end-column="9" />
  750 + <folding>
  751 + <element signature="e#441#659#0#PHP" expanded="false" />
  752 + <element signature="e#691#2051#0#PHP" expanded="false" />
  753 + <element signature="e#2057#2078#0#PHP" expanded="false" />
  754 + <element signature="e#2083#3957#0#PHP" expanded="false" />
  755 + <element signature="e#3963#3984#0#PHP" expanded="false" />
  756 + <element signature="e#6103#6347#0#PHP" expanded="false" />
  757 + <element signature="e#6353#6601#0#PHP" expanded="false" />
  758 + <element signature="e#6607#6753#0#PHP" expanded="false" />
  759 + <element signature="e#6758#12559#0#PHP" expanded="false" />
  760 + </folding>
  761 + </state>
  762 + </provider>
  763 + </entry>
  764 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
  765 + <provider selected="true" editor-type-id="text-editor">
  766 + <state relative-caret-position="455">
  767 + <caret line="39" column="28" lean-forward="true" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="28" />
800 <folding /> 768 <folding />
801 </state> 769 </state>
802 </provider> 770 </provider>
803 </entry> 771 </entry>
  772 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  773 + <provider selected="true" editor-type-id="text-editor">
  774 + <state relative-caret-position="63">
  775 + <caret line="172" column="7" lean-forward="false" selection-start-line="172" selection-start-column="7" selection-end-line="172" selection-end-column="7" />
  776 + <folding>
  777 + <element signature="e#2902#3430#0#PHP" expanded="false" />
  778 + <element signature="e#3435#4571#0#PHP" expanded="false" />
  779 + <element signature="e#4577#4984#0#PHP" expanded="false" />
  780 + <element signature="e#4989#5332#0#PHP" expanded="false" />
  781 + <element signature="e#5338#5751#0#PHP" expanded="false" />
  782 + <element signature="e#6112#6949#0#PHP" expanded="false" />
  783 + <element signature="e#6954#9149#0#PHP" expanded="false" />
  784 + <element signature="e#9155#9800#0#PHP" expanded="false" />
  785 + <element signature="e#22993#23498#0#PHP" expanded="false" />
  786 + <element signature="e#23503#23754#0#PHP" expanded="false" />
  787 + <element signature="e#23760#24239#0#PHP" expanded="false" />
  788 + <element signature="e#24244#25001#0#PHP" expanded="false" />
  789 + <element signature="e#25007#25488#0#PHP" expanded="false" />
  790 + <element signature="e#25493#26263#0#PHP" expanded="false" />
  791 + <element signature="e#26269#26632#0#PHP" expanded="false" />
  792 + <element signature="e#26637#26828#0#PHP" expanded="false" />
  793 + <element signature="e#26834#27192#0#PHP" expanded="false" />
  794 + <element signature="e#27197#27388#0#PHP" expanded="false" />
  795 + <element signature="e#27394#28537#0#PHP" expanded="false" />
  796 + <element signature="e#28542#31207#0#PHP" expanded="false" />
  797 + <element signature="e#31213#31711#0#PHP" expanded="false" />
  798 + <element signature="e#31716#33462#0#PHP" expanded="false" />
  799 + <element signature="e#33468#33881#0#PHP" expanded="false" />
  800 + <element signature="e#33886#34365#0#PHP" expanded="false" />
  801 + <element signature="e#34371#34905#0#PHP" expanded="false" />
  802 + <element signature="e#34910#36295#0#PHP" expanded="false" />
  803 + <element signature="e#36301#36955#0#PHP" expanded="false" />
  804 + <element signature="e#36960#38975#0#PHP" expanded="false" />
  805 + <element signature="e#38981#39741#0#PHP" expanded="false" />
  806 + <element signature="e#39746#42455#0#PHP" expanded="false" />
  807 + <element signature="e#42481#43312#0#PHP" expanded="false" />
  808 + <element signature="e#43318#43738#0#PHP" expanded="false" />
  809 + <element signature="e#43743#44226#0#PHP" expanded="false" />
  810 + <element signature="e#44232#45038#0#PHP" expanded="false" />
  811 + <element signature="e#45043#48197#0#PHP" expanded="false" />
  812 + <element signature="e#48212#49540#0#PHP" expanded="false" />
  813 + <element signature="e#49556#50583#0#PHP" expanded="false" />
  814 + <element signature="e#50589#51347#0#PHP" expanded="false" />
  815 + <element signature="e#51352#55095#0#PHP" expanded="false" />
  816 + <element signature="e#55101#55493#0#PHP" expanded="false" />
  817 + <element signature="e#55498#56450#0#PHP" expanded="false" />
  818 + <element signature="e#56474#57047#0#PHP" expanded="false" />
  819 + <element signature="e#57053#57652#0#PHP" expanded="false" />
  820 + <element signature="e#57657#58584#0#PHP" expanded="false" />
  821 + <element signature="e#58590#59304#0#PHP" expanded="false" />
  822 + <element signature="e#59310#59737#0#PHP" expanded="false" />
  823 + <element signature="e#59742#60211#0#PHP" expanded="false" />
  824 + </folding>
  825 + </state>
  826 + </provider>
  827 + </entry>
804 </component> 828 </component>
805 </project> 829 </project>
@@ -58,9 +58,12 @@ class Pic extends Backend @@ -58,9 +58,12 @@ class Pic extends Backend
58 58
59 $list = collection($list)->toArray(); 59 $list = collection($list)->toArray();
60 $type = new \app\admin\model\Type(); 60 $type = new \app\admin\model\Type();
  61 + $pictype = new \app\admin\model\Pictype();
61 foreach ($list as &$v){ 62 foreach ($list as &$v){
62 $type_ids = $type->whereIn('id',$v['type_ids'])->column('area_name'); 63 $type_ids = $type->whereIn('id',$v['type_ids'])->column('area_name');
  64 + $pictype_ids = $pictype->whereIn('id',$v['pictype_ids'])->column('typename');
63 $v['type_ids'] = trim(implode(',',$type_ids),','); 65 $v['type_ids'] = trim(implode(',',$type_ids),',');
  66 + $v['pictype_ids'] = trim(implode(',',$pictype_ids),',');
64 } 67 }
65 $result = array("total" => $total, "rows" => $list); 68 $result = array("total" => $total, "rows" => $list);
66 69
@@ -79,6 +82,7 @@ class Pic extends Backend @@ -79,6 +82,7 @@ class Pic extends Backend
79 if ($params) { 82 if ($params) {
80 $params = $this->preExcludeFields($params); 83 $params = $this->preExcludeFields($params);
81 $params['type_ids'] =','.$params['type_ids'].','; 84 $params['type_ids'] =','.$params['type_ids'].',';
  85 + $params['pictype_ids'] =','.$params['pictype_ids'].',';
82 if ($this->dataLimit && $this->dataLimitFieldAutoFill) { 86 if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
83 $params[$this->dataLimitField] = $this->auth->id; 87 $params[$this->dataLimitField] = $this->auth->id;
84 } 88 }
@@ -132,6 +136,7 @@ class Pic extends Backend @@ -132,6 +136,7 @@ class Pic extends Backend
132 if ($this->request->isPost()) { 136 if ($this->request->isPost()) {
133 $params = $this->request->post("row/a"); 137 $params = $this->request->post("row/a");
134 $params['type_ids'] =','.$params['type_ids'].','; 138 $params['type_ids'] =','.$params['type_ids'].',';
  139 + $params['pictype_ids'] =','.$params['pictype_ids'].',';
135 if ($params) { 140 if ($params) {
136 $params = $this->preExcludeFields($params); 141 $params = $this->preExcludeFields($params);
137 $result = false; 142 $result = false;
@@ -176,6 +181,15 @@ class Pic extends Backend @@ -176,6 +181,15 @@ class Pic extends Backend
176 return json($arr); 181 return json($arr);
177 } 182 }
178 183
  184 + public function pictype(){
  185 + $res = Db::name('pictype')->field('id,typename')->select();
  186 + $arr = [];
  187 + foreach($res as $key=>$value){
  188 + $arr[$value['id']] = $value['typename'];
  189 + }
  190 + return json($arr);
  191 + }
  192 +
179 /** 193 /**
180 * 生成查询所需要的条件,排序方式 194 * 生成查询所需要的条件,排序方式
181 * @param mixed $searchfields 快速查询的字段 195 * @param mixed $searchfields 快速查询的字段
  1 +<?php
  2 +
  3 +namespace app\admin\controller;
  4 +
  5 +use app\common\controller\Backend;
  6 +
  7 +/**
  8 + * 图片类型管理
  9 + *
  10 + * @icon fa fa-circle-o
  11 + */
  12 +class Pictype extends Backend
  13 +{
  14 +
  15 + /**
  16 + * Pictype模型对象
  17 + * @var \app\admin\model\Pictype
  18 + */
  19 + protected $model = null;
  20 +
  21 + public function _initialize()
  22 + {
  23 + parent::_initialize();
  24 + $this->model = new \app\admin\model\Pictype;
  25 +
  26 + }
  27 +
  28 + /**
  29 + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
  30 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
  31 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
  32 + */
  33 +
  34 +
  35 +}
@@ -8,6 +8,7 @@ return [ @@ -8,6 +8,7 @@ return [
8 'Keyword' => '关键词（多个关键词中间用逗号隔开）', 8 'Keyword' => '关键词（多个关键词中间用逗号隔开）',
9 'Thumbnail' => '缩略图', 9 'Thumbnail' => '缩略图',
10 'Type_ids' => '地区标签', 10 'Type_ids' => '地区标签',
  11 + 'Pictype_ids' => '图片类型',
11 'Water_url' => '带水印的小样图片', 12 'Water_url' => '带水印的小样图片',
12 'Url' => '高清百度云盘地址', 13 'Url' => '高清百度云盘地址',
13 'Code' =>'提取码', 14 'Code' =>'提取码',
  1 +<?php
  2 +
  3 +return [
  4 + 'Id' => '图片类型ID',
  5 + 'Typename' => '分类名称',
  6 + 'Thumbnail' => '缩略图',
  7 + 'Createtime' => '创建时间',
  8 + 'Updatetime' => '修改时间'
  9 +];
  1 +<?php
  2 +
  3 +namespace app\admin\model;
  4 +
  5 +use think\Model;
  6 +
  7 +
  8 +class Pictype extends Model
  9 +{
  10 +
  11 +
  12 +
  13 +
  14 +
  15 + // 表名
  16 + protected $name = 'pictype';
  17 +
  18 + // 自动写入时间戳字段
  19 + protected $autoWriteTimestamp = 'int';
  20 +
  21 + // 定义时间戳字段名
  22 + protected $createTime = 'createtime';
  23 + protected $updateTime = 'updatetime';
  24 + protected $deleteTime = false;
  25 +
  26 + // 追加属性
  27 + protected $append = [
  28 +
  29 + ];
  30 +
  31 + public function pic()
  32 + {
  33 + return $this->belongsTo('Pic', 'pictype_id')->setEagerlyType(0);
  34 + }
  35 +
  36 +
  37 +
  38 +}
  1 +<?php
  2 +
  3 +namespace app\admin\validate;
  4 +
  5 +use think\Validate;
  6 +
  7 +class Pictype extends Validate
  8 +{
  9 + /**
  10 + * 验证规则
  11 + */
  12 + protected $rule = [
  13 + ];
  14 + /**
  15 + * 提示消息
  16 + */
  17 + protected $message = [
  18 + ];
  19 + /**
  20 + * 验证场景
  21 + */
  22 + protected $scene = [
  23 + 'add' => [],
  24 + 'edit' => [],
  25 + ];
  26 +
  27 +}
@@ -44,6 +44,12 @@ @@ -44,6 +44,12 @@
44 </div> 44 </div>
45 </div> 45 </div>
46 <div class="form-group"> 46 <div class="form-group">
  47 + <label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
  48 + <div class="col-xs-12 col-sm-8">
  49 + <input id="c-pictype_ids" data-rule="required" data-source="pictype/index" data-multiple="true" data-field="typename" class="form-control selectpage" name="row[pictype_ids]" type="text" value="">
  50 + </div>
  51 + </div>
  52 + <div class="form-group">
47 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label> 53 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
48 <div class="col-xs-12 col-sm-8"> 54 <div class="col-xs-12 col-sm-8">
49 <div class="input-group"> 55 <div class="input-group">
@@ -44,6 +44,12 @@ @@ -44,6 +44,12 @@
44 </div> 44 </div>
45 </div> 45 </div>
46 <div class="form-group"> 46 <div class="form-group">
  47 + <label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
  48 + <div class="col-xs-12 col-sm-8">
  49 + <input id="c-pictype_ids" data-rule="required" data-source="pictype/index" data-multiple="true" data-field="typename" class="form-control selectpage" name="row[pictype_ids]" type="text" value="{$row.pictype_ids}">
  50 + </div>
  51 + </div>
  52 + <div class="form-group">
47 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label> 53 <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
48 <div class="col-xs-12 col-sm-8"> 54 <div class="col-xs-12 col-sm-8">
49 <div class="input-group"> 55 <div class="input-group">
  1 +<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
  2 +
  3 + <div class="form-group">
  4 + <label class="control-label col-xs-12 col-sm-2">{:__('Typename')}:</label>
  5 + <div class="col-xs-12 col-sm-8">
  6 + <input id="c-typename" class="form-control" name="row[typename]" type="text">
  7 + </div>
  8 + </div>
  9 + <div class="form-group">
  10 + <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
  11 + <div class="col-xs-12 col-sm-8">
  12 + <div class="input-group">
  13 + <input id="c-thumbnail" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" placeholder="请输入缩略图">
  14 + <div class="input-group-addon no-border no-padding">
  15 + <span><button type="button" id="plupload-thumbnail" class="btn btn-danger plupload" data-input-id="c-thumbnail" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-thumbnail"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  16 + <span><button type="button" id="fachoose-thumbnail" class="btn btn-primary fachoose" data-input-id="c-thumbnail" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  17 + </div>
  18 + <span class="msg-box n-right"></span>
  19 + </div>
  20 + <ul class="row list-inline plupload-preview" id="p-thumbnail"></ul>
  21 + </div>
  22 + </div>
  23 + <div class="form-group layer-footer">
  24 + <label class="control-label col-xs-12 col-sm-2"></label>
  25 + <div class="col-xs-12 col-sm-8">
  26 + <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
  27 + <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
  28 + </div>
  29 + </div>
  30 +</form>
  1 +<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
  2 +
  3 + <div class="form-group">
  4 + <label class="control-label col-xs-12 col-sm-2">{:__('Typename')}:</label>
  5 + <div class="col-xs-12 col-sm-8">
  6 + <input id="c-typename" class="form-control" name="row[typename]" type="text" value="{$row.typename|htmlentities}">
  7 + </div>
  8 + </div>
  9 + <div class="form-group">
  10 + <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
  11 + <div class="col-xs-12 col-sm-8">
  12 + <div class="input-group">
  13 + <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传缩略图">
  14 + <div class="input-group-addon no-border no-padding">
  15 + <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  16 + <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  17 + </div>
  18 + <span class="msg-box n-right"></span>
  19 + </div>
  20 + <ul class="row list-inline plupload-preview" id="p-image"></ul>
  21 + </div>
  22 + </div>
  23 + <div class="form-group layer-footer">
  24 + <label class="control-label col-xs-12 col-sm-2"></label>
  25 + <div class="col-xs-12 col-sm-8">
  26 + <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
  27 + <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
  28 + </div>
  29 + </div>
  30 +</form>
  1 +<div class="panel panel-default panel-intro">
  2 + {:build_heading()}
  3 +
  4 + <div class="panel-body">
  5 + <div id="myTabContent" class="tab-content">
  6 + <div class="tab-pane fade active in" id="one">
  7 + <div class="widget-body no-padding">
  8 + <div id="toolbar" class="toolbar">
  9 + <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
  10 + <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('pictype/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
  11 + <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('pictype/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
  12 + <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('pictype/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
  13 + <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('pictype/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
  14 +
  15 + <div class="dropdown btn-group {:$auth->check('pictype/multi')?'':'hide'}">
  16 + <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
  17 + <ul class="dropdown-menu text-left" role="menu">
  18 + <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
  19 + <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
  20 + </ul>
  21 + </div>
  22 +
  23 +
  24 + </div>
  25 + <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
  26 + data-operate-edit="{:$auth->check('pictype/edit')}"
  27 + data-operate-del="{:$auth->check('pictype/del')}"
  28 + width="100%">
  29 + </table>
  30 + </div>
  31 + </div>
  32 +
  33 + </div>
  34 + </div>
  35 +</div>
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 </div> 7 </div>
8 </div> 8 </div>
9 <div class="form-group"> 9 <div class="form-group">
10 - <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label> 10 + <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
11 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
12 <div class="input-group"> 12 <div class="input-group">
13 <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传缩略图"> 13 <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传缩略图">
@@ -171,6 +171,39 @@ class User extends Api @@ -171,6 +171,39 @@ class User extends Api
171 } 171 }
172 172
173 /** 173 /**
  174 + * @ApiTitle (图片分类(类型))
  175 + * @ApiSummary (图片分类(类型))
  176 + * @ApiMethod (POST)
  177 + * @ApiRoute (/api/user/pictype)
  178 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  179 + *
  180 + * @ApiReturn({
  181 + "code": 1,
  182 + "msg": "成功",
  183 + "time": "1571492001",
  184 + "data": {
  185 + "id": 4,//分类id
  186 + "typename": //分类名称
  187 + "thumbnail": //图片
  188 + }
  189 + })
  190 + */
  191 + public function pictype()
  192 + {
  193 + $rule = config('verify.path');
  194 + $data = Db::name('pictype')
  195 + ->field('id,typename,thumbnail')
  196 + ->order('id desc')
  197 + ->select();
  198 + foreach ($data as &$v){
  199 + $v['thumbnail'] = $rule.$v['thumbnail'];
  200 + }
  201 + $this->success('SUCCESS',$data);
  202 + }
  203 +
  204 +
  205 +
  206 + /**
174 * @ApiTitle (搜索页) 207 * @ApiTitle (搜索页)
175 * @ApiSummary (搜索页) 208 * @ApiSummary (搜索页)
176 * @ApiMethod (POST) 209 * @ApiMethod (POST)
此 diff 太大无法显示。
@@ -32,6 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -32,6 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
32 {field: 'keyword', title: __('Keyword'),operate:false}, 32 {field: 'keyword', title: __('Keyword'),operate:false},
33 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 33 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
34 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')}, 34 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
  35 + {field: 'pictype_ids', title: __('Pictype_ids'),searchList:$.getJSON('pic/pictype')},
35 {field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 36 {field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
36 {field: 'url', title: __('Url'),operate:false, formatter: Table.api.formatter.url}, 37 {field: 'url', title: __('Url'),operate:false, formatter: Table.api.formatter.url},
37 {field: 'code', title: __('Code'),operate:false}, 38 {field: 'code', title: __('Code'),operate:false},
  1 +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
  2 +
  3 + var Controller = {
  4 + index: function () {
  5 + // 初始化表格参数配置
  6 + Table.api.init({
  7 + extend: {
  8 + index_url: 'pictype/index' + location.search,
  9 + add_url: 'pictype/add',
  10 + edit_url: 'pictype/edit',
  11 + del_url: 'pictype/del',
  12 + multi_url: 'pictype/multi',
  13 + table: 'pictype',
  14 + }
  15 + });
  16 +
  17 + var table = $("#table");
  18 +
  19 + // 初始化表格
  20 + table.bootstrapTable({
  21 + url: $.fn.bootstrapTable.defaults.extend.index_url,
  22 + pk: 'id',
  23 + sortName: 'id',
  24 + columns: [
  25 + [
  26 + {checkbox: true},
  27 + {field: 'id', title: __('Id')},
  28 + {field: 'typename', title: __('Typename')},
  29 + {field: 'thumbnail', title: __('Thumbnail'), formatter:Table.api.formatter.image},
  30 + {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  31 + {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  32 + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
  33 + ]
  34 + ]
  35 + });
  36 +
  37 + // 为表格绑定事件
  38 + Table.api.bindevent(table);
  39 + },
  40 + add: function () {
  41 + Controller.api.bindevent();
  42 + },
  43 + edit: function () {
  44 + Controller.api.bindevent();
  45 + },
  46 + api: {
  47 + bindevent: function () {
  48 + Form.api.bindevent($("form[role=form]"));
  49 + }
  50 + }
  51 + };
  52 + return Controller;
  53 +});