郭盛 / areial · 提交

转到一个项目

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

修改后台图片类型

内嵌 并排对比
正在显示 17 个修改的文件 包含 649 行增加 和 307 行删除
... ... @@ -2,22 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Pic.php" afterPath="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" afterPath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/type/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/type/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -27,7 +20,66 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="63">
<caret line="172" column="7" lean-forward="false" selection-start-line="172" selection-start-column="7" selection-end-line="172" selection-end-column="7" />
<folding>
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#6112#6949#0#PHP" expanded="false" />
<element signature="e#6954#9149#0#PHP" expanded="false" />
<element signature="e#9155#9800#0#PHP" expanded="false" />
<element signature="e#22993#23498#0#PHP" expanded="false" />
<element signature="e#23503#23754#0#PHP" expanded="false" />
<element signature="e#23760#24239#0#PHP" expanded="false" />
<element signature="e#24244#25001#0#PHP" expanded="false" />
<element signature="e#25007#25488#0#PHP" expanded="false" />
<element signature="e#25493#26263#0#PHP" expanded="false" />
<element signature="e#26269#26632#0#PHP" expanded="false" />
<element signature="e#26637#26828#0#PHP" expanded="false" />
<element signature="e#26834#27192#0#PHP" expanded="false" />
<element signature="e#27197#27388#0#PHP" expanded="false" />
<element signature="e#27394#28537#0#PHP" expanded="false" />
<element signature="e#28542#31207#0#PHP" expanded="false" />
<element signature="e#31213#31711#0#PHP" expanded="false" />
<element signature="e#31716#33462#0#PHP" expanded="false" />
<element signature="e#33468#33881#0#PHP" expanded="false" />
<element signature="e#33886#34365#0#PHP" expanded="false" />
<element signature="e#34371#34905#0#PHP" expanded="false" />
<element signature="e#34910#36295#0#PHP" expanded="false" />
<element signature="e#36301#36955#0#PHP" expanded="false" />
<element signature="e#36960#38975#0#PHP" expanded="false" />
<element signature="e#38981#39741#0#PHP" expanded="false" />
<element signature="e#39746#42455#0#PHP" expanded="false" />
<element signature="e#42481#43312#0#PHP" expanded="false" />
<element signature="e#43318#43738#0#PHP" expanded="false" />
<element signature="e#43743#44226#0#PHP" expanded="false" />
<element signature="e#44232#45038#0#PHP" expanded="false" />
<element signature="e#45043#48197#0#PHP" expanded="false" />
<element signature="e#48212#49540#0#PHP" expanded="false" />
<element signature="e#49556#50583#0#PHP" expanded="false" />
<element signature="e#50589#51347#0#PHP" expanded="false" />
<element signature="e#51352#55095#0#PHP" expanded="false" />
<element signature="e#55101#55493#0#PHP" expanded="false" />
<element signature="e#55498#56450#0#PHP" expanded="false" />
<element signature="e#56474#57047#0#PHP" expanded="false" />
<element signature="e#57053#57652#0#PHP" expanded="false" />
<element signature="e#57657#58584#0#PHP" expanded="false" />
<element signature="e#58590#59304#0#PHP" expanded="false" />
<element signature="e#59310#59737#0#PHP" expanded="false" />
<element signature="e#59742#60211#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
... ... @@ -45,12 +97,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/view/video/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/type.js" />
<option value="$PROJECT_DIR$/application/admin/view/type/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/type/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />
<option value="$PROJECT_DIR$/application/admin/model/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/model/Type.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/index.html" />
... ... @@ -80,12 +126,6 @@
<option value="$PROJECT_DIR$/application/nsms/nsms.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
... ... @@ -96,6 +136,18 @@
<option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/admin/view/pictype/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/pictype/edit.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/admin/model/Pictype.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pictype.js" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -113,11 +165,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="42" />
<option name="y" value="112" />
<option name="width" value="1907" />
<option name="height" value="943" />
<component name="ProjectFrameBounds">
<option name="x" value="319" />
<option name="y" value="56" />
<option name="width" value="1700" />
<option name="height" value="1000" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -134,7 +186,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -151,39 +202,21 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -256,7 +289,15 @@
<workItem from="1575340427887" duration="256000" />
<workItem from="1575420983161" duration="9911000" />
<workItem from="1575444277051" duration="130000" />
<workItem from="1575457595017" duration="3691000" />
<workItem from="1575457595017" duration="3898000" />
<workItem from="1575462829570" duration="262000" />
<workItem from="1575505399026" duration="2520000" />
<workItem from="1575527050192" duration="243000" />
<workItem from="1575538373568" duration="280000" />
<workItem from="1575541798312" duration="2359000" />
<workItem from="1575592025964" duration="640000" />
<workItem from="1575599624364" duration="95000" />
<workItem from="1575680867057" duration="4648000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -269,7 +310,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="303293000" />
<option name="totallyTimeSpent" value="314547000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -281,16 +322,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="42" y="112" width="1907" height="943" extended-state="1" />
<frame x="319" y="56" width="1700" height="1000" extended-state="0" />
<layout>
<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" />
<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" />
<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" />
<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" />
<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" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="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" />
<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" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -333,103 +374,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="12" />
<option name="time" value="16" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/extend/nsms/nsms.php" />
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="17" lean-forward="true" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Order/Client.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="34" column="20" lean-forward="false" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/cert/证书使用说明.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/cert/apiclient_key.pem">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/cert/apiclient_cert.pem">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Reverse/Client.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Factory.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
<caret line="79" column="0" lean-forward="true" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/validate/Vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/Vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -458,13 +407,7 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="5" column="114" lean-forward="true" selection-start-line="5" selection-start-column="114" selection-end-line="5" selection-end-column="114" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/1.html" />
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
... ... @@ -507,44 +450,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />
<folding>
<element signature="e#38#68#0#PHP" expanded="false" />
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
<element signature="e#1017#3093#0#PHP" expanded="false" />
<element signature="e#3099#3419#0#PHP" expanded="false" />
<element signature="e#3424#5506#0#PHP" expanded="false" />
<element signature="e#5512#5930#0#PHP" expanded="false" />
<element signature="e#6179#6269#0#PHP" expanded="false" />
<element signature="e#6347#6443#0#PHP" expanded="false" />
<element signature="e#7641#7929#0#PHP" expanded="false" />
<element signature="e#8006#8279#0#PHP" expanded="false" />
<element signature="e#11461#13236#0#PHP" expanded="false" />
<element signature="e#13309#13729#0#PHP" expanded="false" />
<element signature="e#15368#15656#0#PHP" expanded="false" />
<element signature="e#15732#16005#0#PHP" expanded="false" />
<element signature="e#16160#16470#0#PHP" expanded="false" />
<element signature="e#16545#16996#0#PHP" expanded="false" />
<element signature="e#17073#18117#0#PHP" expanded="false" />
<element signature="e#18211#18329#0#PHP" expanded="false" />
<element signature="e#21048#21345#0#PHP" expanded="false" />
<element signature="e#21350#21743#0#PHP" expanded="false" />
<element signature="e#21770#25248#0#PHP" expanded="false" />
<element signature="e#25277#28182#0#PHP" expanded="false" />
<element signature="e#28211#31661#0#PHP" expanded="false" />
<element signature="e#29087#29692#0#PHP" expanded="false" />
<element signature="e#29713#31150#0#PHP" expanded="false" />
<element signature="e#31198#31300#0#PHP" expanded="false" />
<element signature="e#31690#35427#0#PHP" expanded="false" />
<element signature="e#35450#35667#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
... ... @@ -605,201 +510,320 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="267">
<caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="20" column="43" lean-forward="false" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="437" column="7" lean-forward="true" selection-start-line="437" selection-start-column="7" selection-end-line="437" selection-end-column="7" />
<state relative-caret-position="125">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="28" column="63" lean-forward="false" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373">
<caret line="40" column="26" lean-forward="false" selection-start-line="40" selection-start-column="26" selection-end-line="40" selection-end-column="26" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#6175#0#PHP" expanded="false" />
<element signature="e#6180#8375#0#PHP" expanded="false" />
<element signature="e#8381#9026#0#PHP" expanded="false" />
<element signature="e#9031#10127#0#PHP" expanded="false" />
<element signature="e#10133#10922#0#PHP" expanded="false" />
<element signature="e#10927#12275#0#PHP" expanded="false" />
<element signature="e#12281#12983#0#PHP" expanded="false" />
<element signature="e#12988#14188#0#PHP" expanded="false" />
<element signature="e#14194#14770#0#PHP" expanded="false" />
<element signature="e#14775#15336#0#PHP" expanded="false" />
<element signature="e#15342#16026#0#PHP" expanded="false" />
<element signature="e#16031#18127#0#PHP" expanded="false" />
<element signature="e#18133#19003#0#PHP" expanded="false" />
<element signature="e#19008#21504#0#PHP" expanded="false" />
<element signature="e#21510#21887#0#PHP" expanded="false" />
<element signature="e#21892#22213#0#PHP" expanded="false" />
<element signature="e#22219#22724#0#PHP" expanded="false" />
<element signature="e#22729#22980#0#PHP" expanded="false" />
<element signature="e#22986#23465#0#PHP" expanded="false" />
<element signature="e#23470#24227#0#PHP" expanded="false" />
<element signature="e#24233#24714#0#PHP" expanded="false" />
<element signature="e#24719#25489#0#PHP" expanded="false" />
<element signature="e#25495#25858#0#PHP" expanded="false" />
<element signature="e#25863#26054#0#PHP" expanded="false" />
<element signature="e#26060#26418#0#PHP" expanded="false" />
<element signature="e#26423#26614#0#PHP" expanded="false" />
<element signature="e#26620#27763#0#PHP" expanded="false" />
<element signature="e#27768#30433#0#PHP" expanded="false" />
<element signature="e#30439#30937#0#PHP" expanded="false" />
<element signature="e#30942#32688#0#PHP" expanded="false" />
<element signature="e#32694#33107#0#PHP" expanded="false" />
<element signature="e#33112#33591#0#PHP" expanded="false" />
<element signature="e#33597#34131#0#PHP" expanded="false" />
<element signature="e#34136#35521#0#PHP" expanded="false" />
<element signature="e#35527#36181#0#PHP" expanded="false" />
<element signature="e#36186#38201#0#PHP" expanded="false" />
<element signature="e#37224#37686#0#PHP" expanded="false" />
<element signature="e#38207#38967#0#PHP" expanded="false" />
<element signature="e#38972#41681#0#PHP" expanded="false" />
<element signature="e#41707#42538#0#PHP" expanded="false" />
<element signature="e#42544#42964#0#PHP" expanded="false" />
<element signature="e#42969#43452#0#PHP" expanded="false" />
<element signature="e#43458#44264#0#PHP" expanded="false" />
<element signature="e#44269#47423#0#PHP" expanded="false" />
<element signature="e#47438#48766#0#PHP" expanded="false" />
<element signature="e#48782#49809#0#PHP" expanded="false" />
<element signature="e#49815#50573#0#PHP" expanded="false" />
<element signature="e#50578#54321#0#PHP" expanded="false" />
<element signature="e#54327#54719#0#PHP" expanded="false" />
<element signature="e#54724#55676#0#PHP" expanded="false" />
<element signature="e#55700#56273#0#PHP" expanded="false" />
<element signature="e#56279#56878#0#PHP" expanded="false" />
<element signature="e#56883#57810#0#PHP" expanded="false" />
<element signature="e#57816#58530#0#PHP" expanded="false" />
<element signature="e#58536#58963#0#PHP" expanded="false" />
<element signature="e#58968#59437#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
<element signature="e#1017#3093#0#PHP" expanded="false" />
<element signature="e#3099#3419#0#PHP" expanded="false" />
<element signature="e#3424#5506#0#PHP" expanded="false" />
<element signature="e#5512#5930#0#PHP" expanded="false" />
<element signature="e#5935#13303#0#PHP" expanded="false" />
<element signature="e#13309#13729#0#PHP" expanded="false" />
<element signature="e#13734#21031#0#PHP" expanded="false" />
<element signature="e#21048#21345#0#PHP" expanded="false" />
<element signature="e#21350#21743#0#PHP" expanded="false" />
<element signature="e#21770#25248#0#PHP" expanded="false" />
<element signature="e#25277#28182#0#PHP" expanded="false" />
<element signature="e#28211#31661#0#PHP" expanded="false" />
<element signature="e#31690#35427#0#PHP" expanded="false" />
<element signature="e#35450#35667#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/type/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/type/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="21" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pictype/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="26" lean-forward="false" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
<caret line="6" column="14" lean-forward="true" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/type.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="45" lean-forward="true" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
<state relative-caret-position="100">
<caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="true" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="75">
<caret line="3" column="29" lean-forward="false" selection-start-line="3" selection-start-column="29" selection-end-line="3" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/pictype/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="525">
<caret line="21" column="10" lean-forward="false" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
<state relative-caret-position="250">
<caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/model/relation/OneToOne.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
<state relative-caret-position="252">
<caret line="185" column="20" lean-forward="false" selection-start-line="185" selection-start-column="20" selection-end-line="185" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<entry file="file://$PROJECT_DIR$/application/admin/model/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="20" column="43" lean-forward="false" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<entry file="file://$PROJECT_DIR$/application/admin/model/Type.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
<state relative-caret-position="-27">
<caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Type.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
<state relative-caret-position="-302">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pictype.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="548">
<caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="349">
<caret line="52" column="39" lean-forward="true" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pictype.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
<state relative-caret-position="375">
<caret line="24" column="21" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/model/Pictype.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
<state relative-caret-position="413">
<caret line="28" column="6" lean-forward="true" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
<state relative-caret-position="475">
<caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="28" column="63" lean-forward="false" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
<state relative-caret-position="475">
<caret line="43" column="14" lean-forward="true" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="338">
<caret line="134" column="9" lean-forward="true" selection-start-line="134" selection-start-column="9" selection-end-line="134" selection-end-column="9" />
<folding>
<element signature="e#441#659#0#PHP" expanded="false" />
<element signature="e#691#2051#0#PHP" expanded="false" />
<element signature="e#2057#2078#0#PHP" expanded="false" />
<element signature="e#2083#3957#0#PHP" expanded="false" />
<element signature="e#3963#3984#0#PHP" expanded="false" />
<element signature="e#6103#6347#0#PHP" expanded="false" />
<element signature="e#6353#6601#0#PHP" expanded="false" />
<element signature="e#6607#6753#0#PHP" expanded="false" />
<element signature="e#6758#12559#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="39" column="28" lean-forward="true" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="63">
<caret line="172" column="7" lean-forward="false" selection-start-line="172" selection-start-column="7" selection-end-line="172" selection-end-column="7" />
<folding>
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#6112#6949#0#PHP" expanded="false" />
<element signature="e#6954#9149#0#PHP" expanded="false" />
<element signature="e#9155#9800#0#PHP" expanded="false" />
<element signature="e#22993#23498#0#PHP" expanded="false" />
<element signature="e#23503#23754#0#PHP" expanded="false" />
<element signature="e#23760#24239#0#PHP" expanded="false" />
<element signature="e#24244#25001#0#PHP" expanded="false" />
<element signature="e#25007#25488#0#PHP" expanded="false" />
<element signature="e#25493#26263#0#PHP" expanded="false" />
<element signature="e#26269#26632#0#PHP" expanded="false" />
<element signature="e#26637#26828#0#PHP" expanded="false" />
<element signature="e#26834#27192#0#PHP" expanded="false" />
<element signature="e#27197#27388#0#PHP" expanded="false" />
<element signature="e#27394#28537#0#PHP" expanded="false" />
<element signature="e#28542#31207#0#PHP" expanded="false" />
<element signature="e#31213#31711#0#PHP" expanded="false" />
<element signature="e#31716#33462#0#PHP" expanded="false" />
<element signature="e#33468#33881#0#PHP" expanded="false" />
<element signature="e#33886#34365#0#PHP" expanded="false" />
<element signature="e#34371#34905#0#PHP" expanded="false" />
<element signature="e#34910#36295#0#PHP" expanded="false" />
<element signature="e#36301#36955#0#PHP" expanded="false" />
<element signature="e#36960#38975#0#PHP" expanded="false" />
<element signature="e#38981#39741#0#PHP" expanded="false" />
<element signature="e#39746#42455#0#PHP" expanded="false" />
<element signature="e#42481#43312#0#PHP" expanded="false" />
<element signature="e#43318#43738#0#PHP" expanded="false" />
<element signature="e#43743#44226#0#PHP" expanded="false" />
<element signature="e#44232#45038#0#PHP" expanded="false" />
<element signature="e#45043#48197#0#PHP" expanded="false" />
<element signature="e#48212#49540#0#PHP" expanded="false" />
<element signature="e#49556#50583#0#PHP" expanded="false" />
<element signature="e#50589#51347#0#PHP" expanded="false" />
<element signature="e#51352#55095#0#PHP" expanded="false" />
<element signature="e#55101#55493#0#PHP" expanded="false" />
<element signature="e#55498#56450#0#PHP" expanded="false" />
<element signature="e#56474#57047#0#PHP" expanded="false" />
<element signature="e#57053#57652#0#PHP" expanded="false" />
<element signature="e#57657#58584#0#PHP" expanded="false" />
<element signature="e#58590#59304#0#PHP" expanded="false" />
<element signature="e#59310#59737#0#PHP" expanded="false" />
<element signature="e#59742#60211#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -58,9 +58,12 @@ class Pic extends Backend
$list = collection($list)->toArray();
$type = new \app\admin\model\Type();
$pictype = new \app\admin\model\Pictype();
foreach ($list as &$v){
$type_ids = $type->whereIn('id',$v['type_ids'])->column('area_name');
$pictype_ids = $pictype->whereIn('id',$v['pictype_ids'])->column('typename');
$v['type_ids'] = trim(implode(',',$type_ids),',');
$v['pictype_ids'] = trim(implode(',',$pictype_ids),',');
}
$result = array("total" => $total, "rows" => $list);
... ... @@ -79,6 +82,7 @@ class Pic extends Backend
if ($params) {
$params = $this->preExcludeFields($params);
$params['type_ids'] =','.$params['type_ids'].',';
$params['pictype_ids'] =','.$params['pictype_ids'].',';
if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
$params[$this->dataLimitField] = $this->auth->id;
}
... ... @@ -132,6 +136,7 @@ class Pic extends Backend
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
$params['type_ids'] =','.$params['type_ids'].',';
$params['pictype_ids'] =','.$params['pictype_ids'].',';
if ($params) {
$params = $this->preExcludeFields($params);
$result = false;
... ... @@ -176,6 +181,15 @@ class Pic extends Backend
return json($arr);
}
public function pictype(){
$res = Db::name('pictype')->field('id,typename')->select();
$arr = [];
foreach($res as $key=>$value){
$arr[$value['id']] = $value['typename'];
}
return json($arr);
}
/**
* 生成查询所需要的条件,排序方式
* @param mixed $searchfields 快速查询的字段
... ...
<?php
namespace app\admin\controller;
use app\common\controller\Backend;
/**
* 图片类型管理
*
* @icon fa fa-circle-o
*/
class Pictype extends Backend
{
/**
* Pictype模型对象
* @var \app\admin\model\Pictype
*/
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\Pictype;
}
/**
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
}
... ...
... ... @@ -8,6 +8,7 @@ return [
'Keyword' => '关键词（多个关键词中间用逗号隔开）',
'Thumbnail' => '缩略图',
'Type_ids' => '地区标签',
'Pictype_ids' => '图片类型',
'Water_url' => '带水印的小样图片',
'Url' => '高清百度云盘地址',
'Code' =>'提取码',
... ...
<?php
return [
'Id' => '图片类型ID',
'Typename' => '分类名称',
'Thumbnail' => '缩略图',
'Createtime' => '创建时间',
'Updatetime' => '修改时间'
];
... ...
<?php
namespace app\admin\model;
use think\Model;
class Pictype extends Model
{
// 表名
protected $name = 'pictype';
// 自动写入时间戳字段
protected $autoWriteTimestamp = 'int';
// 定义时间戳字段名
protected $createTime = 'createtime';
protected $updateTime = 'updatetime';
protected $deleteTime = false;
// 追加属性
protected $append = [
];
public function pic()
{
return $this->belongsTo('Pic', 'pictype_id')->setEagerlyType(0);
}
}
... ...
<?php
namespace app\admin\validate;
use think\Validate;
class Pictype extends Validate
{
/**
* 验证规则
*/
protected $rule = [
];
/**
* 提示消息
*/
protected $message = [
];
/**
* 验证场景
*/
protected $scene = [
'add' => [],
'edit' => [],
];
}
... ...
... ... @@ -44,6 +44,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<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="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
... ...
... ... @@ -44,6 +44,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<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}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
... ...
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Typename')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-typename" class="form-control" name="row[typename]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-thumbnail" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" placeholder="请输入缩略图">
<div class="input-group-addon no-border no-padding">
<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>
<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>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-thumbnail"></ul>
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
</form>
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Typename')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-typename" class="form-control" name="row[typename]" type="text" value="{$row.typename|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传缩略图">
<div class="input-group-addon no-border no-padding">
<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>
<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>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-image"></ul>
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
</form>
... ...
<div class="panel panel-default panel-intro">
{:build_heading()}
<div class="panel-body">
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade active in" id="one">
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('pictype/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
<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>
<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>
<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>
<div class="dropdown btn-group {:$auth->check('pictype/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
<ul class="dropdown-menu text-left" role="menu">
<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>
<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>
</ul>
</div>
</div>
<table id="table" class="table table-striped table-bordered table-hover table-nowrap"
data-operate-edit="{:$auth->check('pictype/edit')}"
data-operate-del="{:$auth->check('pictype/del')}"
width="100%">
</table>
</div>
</div>
</div>
</div>
</div>
... ...
... ... @@ -7,7 +7,7 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<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
}
/**
* @ApiTitle (图片分类(类型))
* @ApiSummary (图片分类(类型))
* @ApiMethod (POST)
* @ApiRoute (/api/user/pictype)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": 4,//分类id
"typename": //分类名称
"thumbnail": //图片
}
})
*/
public function pictype()
{
$rule = config('verify.path');
$data = Db::name('pictype')
->field('id,typename,thumbnail')
->order('id desc')
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('SUCCESS',$data);
}
/**
* @ApiTitle (搜索页)
* @ApiSummary (搜索页)
* @ApiMethod (POST)
... ...
此 diff 太大无法显示。
... ... @@ -32,6 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'keyword', title: __('Keyword'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
{field: 'pictype_ids', title: __('Pictype_ids'),searchList:$.getJSON('pic/pictype')},
{field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'url', title: __('Url'),operate:false, formatter: Table.api.formatter.url},
{field: 'code', title: __('Code'),operate:false},
... ...
define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
// 初始化表格参数配置
Table.api.init({
extend: {
index_url: 'pictype/index' + location.search,
add_url: 'pictype/add',
edit_url: 'pictype/edit',
del_url: 'pictype/del',
multi_url: 'pictype/multi',
table: 'pictype',
}
});
var table = $("#table");
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'typename', title: __('Typename')},
{field: 'thumbnail', title: __('Thumbnail'), formatter:Table.api.formatter.image},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
});
// 为表格绑定事件
Table.api.bindevent(table);
},
add: function () {
Controller.api.bindevent();
},
edit: function () {
Controller.api.bindevent();
},
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
}
}
};
return Controller;
});
\ No newline at end of file
... ...