From f349984af1424a48a1ffb17ebc1e38a2380834cf Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Tue, 10 Mar 2020 17:22:50 +0800
Subject: [PATCH] 修改后台图片的关键字以及前台返回
---
.idea/workspace.xml | 612 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
application/admin/controller/Pic.php | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
application/admin/lang/zh-cn/pic.php | 2 ++
application/admin/view/pic/add.html | 32 ++++++++++++--------------------
application/admin/view/pic/edit.html | 32 ++++++++++++--------------------
application/api/controller/User.php | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------
public/api.html | 518 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
public/assets/js/backend/pic.js | 4 ++--
8 files changed, 831 insertions(+), 733 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0dbf409..3c69983 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,8 +6,13 @@
<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/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
+ <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/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.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/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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -18,11 +23,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
+ <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="2388">
- <caret line="1915" column="7" lean-forward="true" selection-start-line="1915" selection-start-column="7" selection-end-line="1915" selection-end-column="7" />
+ <state relative-caret-position="320">
+ <caret line="733" column="0" lean-forward="true" selection-start-line="733" selection-start-column="0" selection-end-line="733" selection-end-column="0" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -37,98 +42,74 @@
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7626#0#PHP" expanded="false" />
- <element signature="e#7631#12326#0#PHP" expanded="false" />
- <element signature="e#12332#13012#0#PHP" expanded="false" />
- <element signature="e#13017#13930#0#PHP" expanded="false" />
- <element signature="e#13936#14725#0#PHP" expanded="false" />
- <element signature="e#14730#16079#0#PHP" expanded="false" />
- <element signature="e#16085#16787#0#PHP" expanded="false" />
- <element signature="e#16792#18112#0#PHP" expanded="false" />
- <element signature="e#18118#18694#0#PHP" expanded="false" />
- <element signature="e#18699#19311#0#PHP" expanded="false" />
- <element signature="e#19317#20033#0#PHP" expanded="false" />
- <element signature="e#20038#22578#0#PHP" expanded="false" />
- <element signature="e#22584#23514#0#PHP" expanded="false" />
- <element signature="e#23519#27569#0#PHP" expanded="false" />
- <element signature="e#27575#27952#0#PHP" expanded="false" />
- <element signature="e#27957#28399#0#PHP" expanded="false" />
- <element signature="e#28405#29140#0#PHP" expanded="false" />
- <element signature="e#29145#30817#0#PHP" expanded="false" />
- <element signature="e#30823#31328#0#PHP" expanded="false" />
- <element signature="e#31333#31584#0#PHP" expanded="false" />
- <element signature="e#31590#32069#0#PHP" expanded="false" />
- <element signature="e#32074#32831#0#PHP" expanded="false" />
- <element signature="e#32837#33318#0#PHP" expanded="false" />
- <element signature="e#33323#34093#0#PHP" expanded="false" />
- <element signature="e#34099#34462#0#PHP" expanded="false" />
- <element signature="e#34467#34658#0#PHP" expanded="false" />
- <element signature="e#34664#35022#0#PHP" expanded="false" />
- <element signature="e#35027#35218#0#PHP" expanded="false" />
- <element signature="e#35224#36367#0#PHP" expanded="false" />
- <element signature="e#36372#39037#0#PHP" expanded="false" />
- <element signature="e#39043#39541#0#PHP" expanded="false" />
- <element signature="e#39546#41292#0#PHP" expanded="false" />
- <element signature="e#41298#41711#0#PHP" expanded="false" />
- <element signature="e#41716#42195#0#PHP" expanded="false" />
- <element signature="e#42201#42735#0#PHP" expanded="false" />
- <element signature="e#42740#44125#0#PHP" expanded="false" />
- <element signature="e#44131#44785#0#PHP" expanded="false" />
- <element signature="e#44790#46805#0#PHP" expanded="false" />
- <element signature="e#46811#47571#0#PHP" expanded="false" />
- <element signature="e#47576#50285#0#PHP" expanded="false" />
- <element signature="e#50311#51142#0#PHP" expanded="false" />
- <element signature="e#51148#51568#0#PHP" expanded="false" />
- <element signature="e#51573#52056#0#PHP" expanded="false" />
- <element signature="e#52062#52868#0#PHP" expanded="false" />
- <element signature="e#52873#56031#0#PHP" expanded="false" />
- <element signature="e#54666#56025#0#PHP" expanded="false" />
- <element signature="e#56046#57381#0#PHP" expanded="false" />
- <element signature="e#56162#56564#0#PHP" expanded="false" />
- <element signature="e#57397#58431#0#PHP" expanded="false" />
- <element signature="e#58437#59195#0#PHP" expanded="false" />
- <element signature="e#59200#62943#0#PHP" expanded="false" />
- <element signature="e#62949#63341#0#PHP" expanded="false" />
- <element signature="e#63346#64298#0#PHP" expanded="false" />
- <element signature="e#64322#64895#0#PHP" expanded="false" />
- <element signature="e#64901#65500#0#PHP" expanded="false" />
- <element signature="e#65505#66432#0#PHP" expanded="false" />
- <element signature="e#66438#67152#0#PHP" expanded="false" />
- <element signature="e#67158#67585#0#PHP" expanded="false" />
- <element signature="e#67590#68059#0#PHP" expanded="false" />
- <element signature="e#68066#69271#0#PHP" expanded="false" />
- <element signature="e#69276#70979#0#PHP" expanded="false" />
- <element signature="e#70985#71762#0#PHP" expanded="false" />
- <element signature="e#71767#75705#0#PHP" expanded="false" />
- <element signature="e#75711#76220#0#PHP" expanded="false" />
- <element signature="e#76225#76897#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="188">
- <caret line="539" column="42" lean-forward="false" selection-start-line="539" selection-start-column="42" selection-end-line="539" selection-end-column="42" />
- <folding>
- <element signature="e#581#700#0#PHP" expanded="false" />
- <element signature="e#706#1019#0#PHP" expanded="false" />
- <element signature="e#1024#3100#0#PHP" expanded="false" />
- <element signature="e#3106#3426#0#PHP" expanded="false" />
- <element signature="e#3431#5513#0#PHP" expanded="false" />
- <element signature="e#5519#5937#0#PHP" expanded="false" />
- <element signature="e#5942#15962#0#PHP" expanded="false" />
- <element signature="e#7706#9115#0#PHP" expanded="false" />
- <element signature="e#9144#13082#0#PHP" expanded="false" />
- <element signature="e#14120#15895#0#PHP" expanded="false" />
- <element signature="e#15979#16276#0#PHP" expanded="false" />
- <element signature="e#16281#16674#0#PHP" expanded="false" />
- <element signature="e#16701#20179#0#PHP" expanded="false" />
- <element signature="e#20208#23113#0#PHP" expanded="false" />
- <element signature="e#24010#25327#0#PHP" expanded="false" />
- <element signature="e#25373#28878#0#PHP" expanded="false" />
- <element signature="e#29511#29728#0#PHP" expanded="false" />
+ <element signature="e#7631#13467#0#PHP" expanded="false" />
+ <element signature="e#8135#8698#0#PHP" expanded="false" />
+ <element signature="e#8743#9871#0#PHP" expanded="false" />
+ <element signature="e#11067#12239#0#PHP" expanded="false" />
+ <element signature="e#13419#13460#0#PHP" expanded="false" />
+ <element signature="e#13473#14153#0#PHP" expanded="false" />
+ <element signature="e#14158#15071#0#PHP" expanded="false" />
+ <element signature="e#15077#15866#0#PHP" expanded="false" />
+ <element signature="e#15871#17220#0#PHP" expanded="false" />
+ <element signature="e#17226#17928#0#PHP" expanded="false" />
+ <element signature="e#17933#19253#0#PHP" expanded="false" />
+ <element signature="e#19259#19835#0#PHP" expanded="false" />
+ <element signature="e#19840#20452#0#PHP" expanded="false" />
+ <element signature="e#20458#21174#0#PHP" expanded="false" />
+ <element signature="e#21179#24811#0#PHP" expanded="false" />
+ <element signature="e#24817#25747#0#PHP" expanded="false" />
+ <element signature="e#25752#29802#0#PHP" expanded="false" />
+ <element signature="e#29808#30185#0#PHP" expanded="false" />
+ <element signature="e#30190#30632#0#PHP" expanded="false" />
+ <element signature="e#30638#31373#0#PHP" expanded="false" />
+ <element signature="e#31378#33050#0#PHP" expanded="false" />
+ <element signature="e#33056#33561#0#PHP" expanded="false" />
+ <element signature="e#33566#33817#0#PHP" expanded="false" />
+ <element signature="e#33823#34302#0#PHP" expanded="false" />
+ <element signature="e#34307#35064#0#PHP" expanded="false" />
+ <element signature="e#35070#35551#0#PHP" expanded="false" />
+ <element signature="e#35556#36326#0#PHP" expanded="false" />
+ <element signature="e#36332#36695#0#PHP" expanded="false" />
+ <element signature="e#36700#36891#0#PHP" expanded="false" />
+ <element signature="e#36897#37255#0#PHP" expanded="false" />
+ <element signature="e#37260#37451#0#PHP" expanded="false" />
+ <element signature="e#37457#38600#0#PHP" expanded="false" />
+ <element signature="e#38605#41270#0#PHP" expanded="false" />
+ <element signature="e#41276#41774#0#PHP" expanded="false" />
+ <element signature="e#41779#43525#0#PHP" expanded="false" />
+ <element signature="e#43531#43944#0#PHP" expanded="false" />
+ <element signature="e#43949#44428#0#PHP" expanded="false" />
+ <element signature="e#44434#44968#0#PHP" expanded="false" />
+ <element signature="e#44973#46358#0#PHP" expanded="false" />
+ <element signature="e#46364#47018#0#PHP" expanded="false" />
+ <element signature="e#47023#49038#0#PHP" expanded="false" />
+ <element signature="e#49044#49804#0#PHP" expanded="false" />
+ <element signature="e#49809#52518#0#PHP" expanded="false" />
+ <element signature="e#52544#53375#0#PHP" expanded="false" />
+ <element signature="e#53381#53801#0#PHP" expanded="false" />
+ <element signature="e#53806#54289#0#PHP" expanded="false" />
+ <element signature="e#54295#55101#0#PHP" expanded="false" />
+ <element signature="e#55106#58264#0#PHP" expanded="false" />
+ <element signature="e#56899#58258#0#PHP" expanded="false" />
+ <element signature="e#58279#59614#0#PHP" expanded="false" />
+ <element signature="e#58395#58797#0#PHP" expanded="false" />
+ <element signature="e#59630#60664#0#PHP" expanded="false" />
+ <element signature="e#60670#61428#0#PHP" expanded="false" />
+ <element signature="e#61433#65176#0#PHP" expanded="false" />
+ <element signature="e#65182#65574#0#PHP" expanded="false" />
+ <element signature="e#65579#66531#0#PHP" expanded="false" />
+ <element signature="e#66555#67128#0#PHP" expanded="false" />
+ <element signature="e#67134#67733#0#PHP" expanded="false" />
+ <element signature="e#67738#68665#0#PHP" expanded="false" />
+ <element signature="e#68671#69385#0#PHP" expanded="false" />
+ <element signature="e#69391#69818#0#PHP" expanded="false" />
+ <element signature="e#69823#70292#0#PHP" expanded="false" />
+ <element signature="e#70299#71504#0#PHP" expanded="false" />
+ <element signature="e#71509#73212#0#PHP" expanded="false" />
+ <element signature="e#73218#73995#0#PHP" expanded="false" />
+ <element signature="e#74000#77938#0#PHP" expanded="false" />
+ <element signature="e#77944#78453#0#PHP" expanded="false" />
+ <element signature="e#78458#79130#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -167,10 +148,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
- <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/common/menu.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Suggest.php" />
<option value="$PROJECT_DIR$/application/admin/view/suggest/index.html" />
@@ -182,7 +159,6 @@
<option value="$PROJECT_DIR$/application/admin/view/feng/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/Common.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
- <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/cover/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/cover/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/cover/edit.html" />
@@ -215,9 +191,14 @@
<option value="$PROJECT_DIR$/application/api/controller/Notify.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
- <option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/a.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
+ <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
+ <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
+ <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
+ <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
+ <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
+ <option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
@@ -235,11 +216,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="-98" />
- <option name="y" value="108" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="244" />
+ <option name="y" value="95" />
<option name="width" value="1940" />
- <option name="height" value="950" />
+ <option name="height" value="952" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -257,7 +238,6 @@
</navigator>
<panes>
<pane id="Scratches" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -283,10 +263,22 @@
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" 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" />
+ </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>
</expand>
<select />
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -296,12 +288,6 @@
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
<component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="D:\htdocs\areial\public\uploads\20191120" />
- <recent name="D:\htdocs\areial\public\uploads" />
- <recent name="D:\htdocs\areial\public\cert" />
- <recent name="D:\htdocs\areial\public\uploads\20191118" />
- </key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\assets\js" />
<recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" />
@@ -309,6 +295,12 @@
<recent name="D:\htdocs\areial\extend" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="D:\htdocs\areial\public\uploads\20191120" />
+ <recent name="D:\htdocs\areial\public\uploads" />
+ <recent name="D:\htdocs\areial\public\cert" />
+ <recent name="D:\htdocs\areial\public\uploads\20191118" />
+ </key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -423,7 +415,8 @@
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="11815000" />
<workItem from="1583714063562" duration="30914000" />
- <workItem from="1583799928944" duration="16806000" />
+ <workItem from="1583799928944" duration="18981000" />
+ <workItem from="1583826020973" duration="5490000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -450,7 +443,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="580399000" />
+ <option name="totallyTimeSpent" value="588064000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -462,16 +455,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-98" y="108" width="1940" height="950" extended-state="1" />
+ <frame x="244" y="95" width="1940" height="952" extended-state="0" />
+ <editor active="true" />
<layout>
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13670212" 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="false" show_stripe_button="true" weight="0.13829787" 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.329602" sideWeight="0.5" order="0" side_tool="true" 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.32876712" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4698647" 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.46871164" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -519,20 +513,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-450">
- <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/assets/js/backend/pictype.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-375">
- <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/view/pictype/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-260">
@@ -556,13 +536,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html" />
<entry file="file://$PROJECT_DIR$/application/admin/controller/Addword.php" />
- <entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-25">
- <caret line="11" column="58" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="58" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json" />
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-600">
@@ -594,20 +568,8 @@
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-table.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="525">
- <caret line="30" column="28" lean-forward="true" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-backend.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-900">
- <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://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-table.js" />
+ <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-backend.js" />
<entry file="file://$PROJECT_DIR$/public/assets/css/backend.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
@@ -715,27 +677,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="275">
- <caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="250">
- <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="325">
- <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
@@ -743,13 +684,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="368">
- <caret line="28" column="63" lean-forward="true" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/share.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
@@ -779,13 +713,6 @@
</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="775">
- <caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
@@ -995,7 +922,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="35" column="22" lean-forward="false" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="22" />
- <folding />
</state>
</provider>
</entry>
@@ -1003,9 +929,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1462">
<caret line="63" column="27" lean-forward="false" selection-start-line="63" selection-start-column="27" selection-end-line="63" selection-end-column="27" />
- <folding>
- <element signature="e#1361#1911#0#PHP" expanded="false" />
- </folding>
</state>
</provider>
</entry>
@@ -1070,22 +993,87 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/application/api/controller/a.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1187">
+ <caret line="216" column="50" lean-forward="true" selection-start-line="216" selection-start-column="50" selection-end-line="216" selection-end-column="50" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="188">
+ <caret line="539" column="42" lean-forward="false" selection-start-line="539" selection-start-column="42" selection-end-line="539" selection-end-column="42" />
+ <folding>
+ <element signature="e#581#700#0#PHP" expanded="false" />
+ <element signature="e#706#1019#0#PHP" expanded="false" />
+ <element signature="e#1024#3100#0#PHP" expanded="false" />
+ <element signature="e#3106#3426#0#PHP" expanded="false" />
+ <element signature="e#3431#5513#0#PHP" expanded="false" />
+ <element signature="e#5519#5937#0#PHP" expanded="false" />
+ <element signature="e#5942#15962#0#PHP" expanded="false" />
+ <element signature="e#7706#9115#0#PHP" expanded="false" />
+ <element signature="e#9144#13082#0#PHP" expanded="false" />
+ <element signature="e#14120#15895#0#PHP" expanded="false" />
+ <element signature="e#15979#16276#0#PHP" expanded="false" />
+ <element signature="e#16281#16674#0#PHP" expanded="false" />
+ <element signature="e#16701#20179#0#PHP" expanded="false" />
+ <element signature="e#20208#23113#0#PHP" expanded="false" />
+ <element signature="e#24010#25327#0#PHP" expanded="false" />
+ <element signature="e#25373#28878#0#PHP" expanded="false" />
+ <element signature="e#29511#29728#0#PHP" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1193">
- <caret line="157" column="85" lean-forward="true" selection-start-line="157" selection-start-column="85" selection-end-line="157" selection-end-column="85" />
+ <state relative-caret-position="177">
+ <caret line="18" column="10" lean-forward="true" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="275">
+ <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="12" selection-end-column="30" />
+ <folding />
+ </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="289">
+ <caret line="31" column="24" lean-forward="true" selection-start-line="31" selection-start-column="24" selection-end-line="32" selection-end-column="111" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="125">
+ <caret line="14" column="79" lean-forward="true" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="9" column="30" lean-forward="false" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
<folding />
</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="183">
- <caret line="128" column="17" lean-forward="true" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
+ <state relative-caret-position="146">
+ <caret line="211" column="9" lean-forward="true" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
- <element signature="e#2450#2641#0#PHP" expanded="false" />
- <element signature="e#2572#2641#0#PHP" expanded="false" />
+ <element signature="e#2201#6736#0#PHP" expanded="false" />
<element signature="e#2658#2853#0#PHP" expanded="false" />
<element signature="e#2783#2853#0#PHP" expanded="false" />
<element signature="e#2870#3069#0#PHP" expanded="false" />
@@ -1099,8 +1087,6 @@
<element signature="e#3787#3875#0#PHP" expanded="false" />
<element signature="e#3892#3990#0#PHP" expanded="false" />
<element signature="e#4007#4107#0#PHP" expanded="false" />
- <element signature="e#7299#7474#0#PHP" expanded="false" />
- <element signature="e#7413#7474#0#PHP" expanded="false" />
<element signature="e#7487#7666#0#PHP" expanded="false" />
<element signature="e#7604#7666#0#PHP" expanded="false" />
<element signature="e#7679#7862#0#PHP" expanded="false" />
@@ -1115,22 +1101,56 @@
<element signature="e#8585#8675#0#PHP" expanded="false" />
<element signature="e#8688#8780#0#PHP" expanded="false" />
<element signature="e#11263#11507#0#PHP" expanded="false" />
+ <element signature="e#11513#11770#0#PHP" expanded="false" />
+ <element signature="e#11776#12041#0#PHP" expanded="false" />
+ <element signature="e#12199#18000#0#PHP" expanded="false" />
</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="200">
- <caret line="119" column="28" lean-forward="true" selection-start-line="119" selection-start-column="28" selection-end-line="119" selection-end-column="28" />
+ <state relative-caret-position="225">
+ <caret line="33" column="79" lean-forward="true" selection-start-line="33" selection-start-column="79" selection-end-line="33" selection-end-column="79" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="175">
+ <caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="250">
+ <caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
+ <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="1366">
+ <caret line="175" column="39" lean-forward="true" selection-start-line="175" selection-start-column="39" selection-end-line="175" selection-end-column="39" />
+ <folding>
+ <element signature="e#691#2392#0#PHP" expanded="false" />
+ <element signature="e#2424#5391#0#PHP" expanded="false" />
+ <element signature="e#8627#8871#0#PHP" expanded="false" />
+ <element signature="e#8877#9134#0#PHP" expanded="false" />
+ <element signature="e#9140#9405#0#PHP" expanded="false" />
+ <element signature="e#9412#9660#0#PHP" expanded="false" />
+ </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="2388">
- <caret line="1915" column="7" lean-forward="true" selection-start-line="1915" selection-start-column="7" selection-end-line="1915" selection-end-column="7" />
+ <state relative-caret-position="320">
+ <caret line="733" column="0" lean-forward="true" selection-start-line="733" selection-start-column="0" selection-end-line="733" selection-end-column="0" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -1145,118 +1165,74 @@
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7626#0#PHP" expanded="false" />
- <element signature="e#7631#12326#0#PHP" expanded="false" />
- <element signature="e#12332#13012#0#PHP" expanded="false" />
- <element signature="e#13017#13930#0#PHP" expanded="false" />
- <element signature="e#13936#14725#0#PHP" expanded="false" />
- <element signature="e#14730#16079#0#PHP" expanded="false" />
- <element signature="e#16085#16787#0#PHP" expanded="false" />
- <element signature="e#16792#18112#0#PHP" expanded="false" />
- <element signature="e#18118#18694#0#PHP" expanded="false" />
- <element signature="e#18699#19311#0#PHP" expanded="false" />
- <element signature="e#19317#20033#0#PHP" expanded="false" />
- <element signature="e#20038#22578#0#PHP" expanded="false" />
- <element signature="e#22584#23514#0#PHP" expanded="false" />
- <element signature="e#23519#27569#0#PHP" expanded="false" />
- <element signature="e#27575#27952#0#PHP" expanded="false" />
- <element signature="e#27957#28399#0#PHP" expanded="false" />
- <element signature="e#28405#29140#0#PHP" expanded="false" />
- <element signature="e#29145#30817#0#PHP" expanded="false" />
- <element signature="e#30823#31328#0#PHP" expanded="false" />
- <element signature="e#31333#31584#0#PHP" expanded="false" />
- <element signature="e#31590#32069#0#PHP" expanded="false" />
- <element signature="e#32074#32831#0#PHP" expanded="false" />
- <element signature="e#32837#33318#0#PHP" expanded="false" />
- <element signature="e#33323#34093#0#PHP" expanded="false" />
- <element signature="e#34099#34462#0#PHP" expanded="false" />
- <element signature="e#34467#34658#0#PHP" expanded="false" />
- <element signature="e#34664#35022#0#PHP" expanded="false" />
- <element signature="e#35027#35218#0#PHP" expanded="false" />
- <element signature="e#35224#36367#0#PHP" expanded="false" />
- <element signature="e#36372#39037#0#PHP" expanded="false" />
- <element signature="e#39043#39541#0#PHP" expanded="false" />
- <element signature="e#39546#41292#0#PHP" expanded="false" />
- <element signature="e#41298#41711#0#PHP" expanded="false" />
- <element signature="e#41716#42195#0#PHP" expanded="false" />
- <element signature="e#42201#42735#0#PHP" expanded="false" />
- <element signature="e#42740#44125#0#PHP" expanded="false" />
- <element signature="e#44131#44785#0#PHP" expanded="false" />
- <element signature="e#44790#46805#0#PHP" expanded="false" />
- <element signature="e#46811#47571#0#PHP" expanded="false" />
- <element signature="e#47576#50285#0#PHP" expanded="false" />
- <element signature="e#50311#51142#0#PHP" expanded="false" />
- <element signature="e#51148#51568#0#PHP" expanded="false" />
- <element signature="e#51573#52056#0#PHP" expanded="false" />
- <element signature="e#52062#52868#0#PHP" expanded="false" />
- <element signature="e#52873#56031#0#PHP" expanded="false" />
- <element signature="e#54666#56025#0#PHP" expanded="false" />
- <element signature="e#56046#57381#0#PHP" expanded="false" />
- <element signature="e#56162#56564#0#PHP" expanded="false" />
- <element signature="e#57397#58431#0#PHP" expanded="false" />
- <element signature="e#58437#59195#0#PHP" expanded="false" />
- <element signature="e#59200#62943#0#PHP" expanded="false" />
- <element signature="e#62949#63341#0#PHP" expanded="false" />
- <element signature="e#63346#64298#0#PHP" expanded="false" />
- <element signature="e#64322#64895#0#PHP" expanded="false" />
- <element signature="e#64901#65500#0#PHP" expanded="false" />
- <element signature="e#65505#66432#0#PHP" expanded="false" />
- <element signature="e#66438#67152#0#PHP" expanded="false" />
- <element signature="e#67158#67585#0#PHP" expanded="false" />
- <element signature="e#67590#68059#0#PHP" expanded="false" />
- <element signature="e#68066#69271#0#PHP" expanded="false" />
- <element signature="e#69276#70979#0#PHP" expanded="false" />
- <element signature="e#70985#71762#0#PHP" expanded="false" />
- <element signature="e#71767#75705#0#PHP" expanded="false" />
- <element signature="e#75711#76220#0#PHP" expanded="false" />
- <element signature="e#76225#76897#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/api/controller/a.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1187">
- <caret line="216" column="50" lean-forward="true" selection-start-line="216" selection-start-column="50" selection-end-line="216" selection-end-column="50" />
- <folding>
- <element signature="e#581#700#0#PHP" expanded="false" />
- <element signature="e#706#1019#0#PHP" expanded="false" />
- <element signature="e#1024#3100#0#PHP" expanded="false" />
- <element signature="e#3106#3426#0#PHP" expanded="false" />
- <element signature="e#3431#5513#0#PHP" expanded="false" />
- <element signature="e#5519#5937#0#PHP" expanded="false" />
- <element signature="e#7706#9115#0#PHP" expanded="false" />
- <element signature="e#14120#15895#0#PHP" expanded="false" />
- <element signature="e#15979#16276#0#PHP" expanded="false" />
- <element signature="e#16281#16674#0#PHP" expanded="false" />
- <element signature="e#16701#20179#0#PHP" expanded="false" />
- <element signature="e#20208#23113#0#PHP" expanded="false" />
- <element signature="e#29182#29399#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="188">
- <caret line="539" column="42" lean-forward="false" selection-start-line="539" selection-start-column="42" selection-end-line="539" selection-end-column="42" />
- <folding>
- <element signature="e#581#700#0#PHP" expanded="false" />
- <element signature="e#706#1019#0#PHP" expanded="false" />
- <element signature="e#1024#3100#0#PHP" expanded="false" />
- <element signature="e#3106#3426#0#PHP" expanded="false" />
- <element signature="e#3431#5513#0#PHP" expanded="false" />
- <element signature="e#5519#5937#0#PHP" expanded="false" />
- <element signature="e#5942#15962#0#PHP" expanded="false" />
- <element signature="e#7706#9115#0#PHP" expanded="false" />
- <element signature="e#9144#13082#0#PHP" expanded="false" />
- <element signature="e#14120#15895#0#PHP" expanded="false" />
- <element signature="e#15979#16276#0#PHP" expanded="false" />
- <element signature="e#16281#16674#0#PHP" expanded="false" />
- <element signature="e#16701#20179#0#PHP" expanded="false" />
- <element signature="e#20208#23113#0#PHP" expanded="false" />
- <element signature="e#24010#25327#0#PHP" expanded="false" />
- <element signature="e#25373#28878#0#PHP" expanded="false" />
- <element signature="e#29511#29728#0#PHP" expanded="false" />
+ <element signature="e#7631#13467#0#PHP" expanded="false" />
+ <element signature="e#8135#8698#0#PHP" expanded="false" />
+ <element signature="e#8743#9871#0#PHP" expanded="false" />
+ <element signature="e#11067#12239#0#PHP" expanded="false" />
+ <element signature="e#13419#13460#0#PHP" expanded="false" />
+ <element signature="e#13473#14153#0#PHP" expanded="false" />
+ <element signature="e#14158#15071#0#PHP" expanded="false" />
+ <element signature="e#15077#15866#0#PHP" expanded="false" />
+ <element signature="e#15871#17220#0#PHP" expanded="false" />
+ <element signature="e#17226#17928#0#PHP" expanded="false" />
+ <element signature="e#17933#19253#0#PHP" expanded="false" />
+ <element signature="e#19259#19835#0#PHP" expanded="false" />
+ <element signature="e#19840#20452#0#PHP" expanded="false" />
+ <element signature="e#20458#21174#0#PHP" expanded="false" />
+ <element signature="e#21179#24811#0#PHP" expanded="false" />
+ <element signature="e#24817#25747#0#PHP" expanded="false" />
+ <element signature="e#25752#29802#0#PHP" expanded="false" />
+ <element signature="e#29808#30185#0#PHP" expanded="false" />
+ <element signature="e#30190#30632#0#PHP" expanded="false" />
+ <element signature="e#30638#31373#0#PHP" expanded="false" />
+ <element signature="e#31378#33050#0#PHP" expanded="false" />
+ <element signature="e#33056#33561#0#PHP" expanded="false" />
+ <element signature="e#33566#33817#0#PHP" expanded="false" />
+ <element signature="e#33823#34302#0#PHP" expanded="false" />
+ <element signature="e#34307#35064#0#PHP" expanded="false" />
+ <element signature="e#35070#35551#0#PHP" expanded="false" />
+ <element signature="e#35556#36326#0#PHP" expanded="false" />
+ <element signature="e#36332#36695#0#PHP" expanded="false" />
+ <element signature="e#36700#36891#0#PHP" expanded="false" />
+ <element signature="e#36897#37255#0#PHP" expanded="false" />
+ <element signature="e#37260#37451#0#PHP" expanded="false" />
+ <element signature="e#37457#38600#0#PHP" expanded="false" />
+ <element signature="e#38605#41270#0#PHP" expanded="false" />
+ <element signature="e#41276#41774#0#PHP" expanded="false" />
+ <element signature="e#41779#43525#0#PHP" expanded="false" />
+ <element signature="e#43531#43944#0#PHP" expanded="false" />
+ <element signature="e#43949#44428#0#PHP" expanded="false" />
+ <element signature="e#44434#44968#0#PHP" expanded="false" />
+ <element signature="e#44973#46358#0#PHP" expanded="false" />
+ <element signature="e#46364#47018#0#PHP" expanded="false" />
+ <element signature="e#47023#49038#0#PHP" expanded="false" />
+ <element signature="e#49044#49804#0#PHP" expanded="false" />
+ <element signature="e#49809#52518#0#PHP" expanded="false" />
+ <element signature="e#52544#53375#0#PHP" expanded="false" />
+ <element signature="e#53381#53801#0#PHP" expanded="false" />
+ <element signature="e#53806#54289#0#PHP" expanded="false" />
+ <element signature="e#54295#55101#0#PHP" expanded="false" />
+ <element signature="e#55106#58264#0#PHP" expanded="false" />
+ <element signature="e#56899#58258#0#PHP" expanded="false" />
+ <element signature="e#58279#59614#0#PHP" expanded="false" />
+ <element signature="e#58395#58797#0#PHP" expanded="false" />
+ <element signature="e#59630#60664#0#PHP" expanded="false" />
+ <element signature="e#60670#61428#0#PHP" expanded="false" />
+ <element signature="e#61433#65176#0#PHP" expanded="false" />
+ <element signature="e#65182#65574#0#PHP" expanded="false" />
+ <element signature="e#65579#66531#0#PHP" expanded="false" />
+ <element signature="e#66555#67128#0#PHP" expanded="false" />
+ <element signature="e#67134#67733#0#PHP" expanded="false" />
+ <element signature="e#67738#68665#0#PHP" expanded="false" />
+ <element signature="e#68671#69385#0#PHP" expanded="false" />
+ <element signature="e#69391#69818#0#PHP" expanded="false" />
+ <element signature="e#69823#70292#0#PHP" expanded="false" />
+ <element signature="e#70299#71504#0#PHP" expanded="false" />
+ <element signature="e#71509#73212#0#PHP" expanded="false" />
+ <element signature="e#73218#73995#0#PHP" expanded="false" />
+ <element signature="e#74000#77938#0#PHP" expanded="false" />
+ <element signature="e#77944#78453#0#PHP" expanded="false" />
+ <element signature="e#78458#79130#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/admin/controller/Pic.php b/application/admin/controller/Pic.php
index 7c6409d..5719ad6 100644
--- a/application/admin/controller/Pic.php
+++ b/application/admin/controller/Pic.php
@@ -58,8 +58,13 @@ class Pic extends Backend
$list = collection($list)->toArray();
$type = new \app\admin\model\Type();
+ $words = new \app\admin\model\Words();
$pictype = new \app\admin\model\Pictype();
foreach ($list as &$v){
+ $text_ids = $words->whereIn('id',$v['text_ids'])->column('name');
+ $v['text_ids'] = implode(',',$text_ids);
+ $address_ids = $words->whereIn('id',$v['address_ids'])->column('name');
+ $v['address_ids'] = implode(',',$address_ids);
$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),',');
@@ -79,6 +84,41 @@ class Pic extends Backend
{
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
+
+ //截取提取码
+ if(!empty($params['url'])){
+ $params['code'] = substr($params['url'],-4);
+ }else{
+ $params['code'] = '';
+ }
+
+
+ //如果内容关键字和地名关键字都为空
+ if($params['text_ids'] == '' && $params['address_ids'] == ''){
+ $this->error('请选择关键字标签');
+ }
+ //内容关键字不为空
+ if($params['text_ids'] != ''){
+ $count_text = count(explode(',',$params['text_ids']));
+ $params['text_ids'] =','.$params['text_ids'].',';
+ }else{
+ $count_text = 0;
+ }
+ //地名关键字不为空
+ if($params['address_ids'] != ''){
+ $count_address = count(explode(',',$params['address_ids']));
+ $params['address_ids'] =','.$params['address_ids'].',';
+ }else{
+ $count_address = 0;
+ }
+ $count = $count_text + $count_address;
+ if($count>=3){
+ true;
+ }else{
+ $this->error('至少选择三个关键字标签');
+ }
+
+
if ($params) {
$params = $this->preExcludeFields($params);
$params['type_ids'] =','.$params['type_ids'].',';
@@ -135,7 +175,39 @@ class Pic extends Backend
}
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
+
+ //截取提取码
+ if(!empty($params['url'])){
+ $params['code'] = substr($params['url'],-4);
+ }else{
+ $params['code'] = '';
+ }
+
$params['type_ids'] =','.$params['type_ids'].',';
+ //如果内容关键字和地名关键字都为空
+ if($params['text_ids'] == '' && $params['address_ids'] == ''){
+ $this->error('请选择关键字标签');
+ }
+ //内容关键字不为空
+ if($params['text_ids'] != ''){
+ $count_text = count(explode(',',$params['text_ids']));
+ $params['text_ids'] =','.$params['text_ids'].',';
+ }else{
+ $count_text = 0;
+ }
+ //地名关键字不为空
+ if($params['address_ids'] != ''){
+ $count_address = count(explode(',',$params['address_ids']));
+ $params['address_ids'] =','.$params['address_ids'].',';
+ }else{
+ $count_address = 0;
+ }
+ $count = $count_text + $count_address;
+ if($count>=3){
+ true;
+ }else{
+ $this->error('至少选择三个关键字标签');
+ }
$params['pictype_ids'] =','.$params['pictype_ids'].',';
if ($params) {
$params = $this->preExcludeFields($params);
@@ -181,6 +253,26 @@ class Pic extends Backend
return json($arr);
}
+ public function text(){
+ $res = Db::name('words')->where('type',2)->field('id,type,name')->select();
+ $arr = [];
+ foreach($res as $key=>$value){
+ $arr[$value['id']] = $value['name'];
+ }
+ return json($arr);
+ }
+
+ public function address()
+ {
+ $res = Db::name('words')->where('type',1)->field('id,type,name')->select();
+ $arr = [];
+ foreach($res as $key=>$value){
+ $arr[$value['id']] = $value['name'];
+ }
+ return json($arr);
+ }
+
+
public function pictype(){
$res = Db::name('pictype')->field('id,typename')->select();
$arr = [];
diff --git a/application/admin/lang/zh-cn/pic.php b/application/admin/lang/zh-cn/pic.php
index 4af4231..efd4447 100644
--- a/application/admin/lang/zh-cn/pic.php
+++ b/application/admin/lang/zh-cn/pic.php
@@ -6,6 +6,8 @@ return [
'Is_top' =>'是否置顶',
'Number' =>'编号',
'Keyword' => '关键词（多个关键词中间用逗号隔开）',
+ 'text_ids' =>'内容关键字标签',
+ 'Address_ids' =>'地名关键字标签',
'Thumbnail' => '缩略图',
'Share' =>'分享到小程序的封面',
'Type_ids' => '地区标签',
diff --git a/application/admin/view/pic/add.html b/application/admin/view/pic/add.html
index 9103e50..fa587c0 100644
--- a/application/admin/view/pic/add.html
+++ b/application/admin/view/pic/add.html
@@ -18,6 +18,18 @@
</div>
</div>
<div class="form-group">
+ <label class="control-label col-xs-12 col-sm-2">{:__('Text_ids')}:</label>
+ <div class="col-xs-12 col-sm-8">
+ <input id="c-text_ids" data-source="words/selectpage" data-multiple="true" data-field="name" data-params='{"custom[type]":"2"}' class="form-control selectpage" name="row[text_ids]" type="text" value="">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-xs-12 col-sm-2">{:__('Address_ids')}:</label>
+ <div class="col-xs-12 col-sm-8">
+ <input id="c-address_ids" data-source="words/selectpage" data-multiple="true" data-field="name" data-params='{"custom[type]":"1"}' class="form-control selectpage" name="row[address_ids]" type="text" value="">
+ </div>
+ </div>
+ <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" placeholder="请输入关键字">
@@ -38,20 +50,6 @@
</div>
</div>
<div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="input-group">
- <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" placeholder="请上传图片(400px*400px)">
- <div class="input-group-addon no-border no-padding">
- <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
- </div>
- <span class="msg-box n-right"></span>
- </div>
- <ul class="row list-inline plupload-preview" id="p-share"></ul>
- </div>
- </div>
- <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="">
@@ -84,12 +82,6 @@
</div>
</div>
<div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-code" class="form-control" name="row[code]" type="text" placeholder="请输入提取码">
- </div>
- </div>
- <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-price" data-rule="required" class="form-control" name="row[price]" type="text" placeholder="请输入普通价格">
diff --git a/application/admin/view/pic/edit.html b/application/admin/view/pic/edit.html
index 8eb540f..db2a2f7 100644
--- a/application/admin/view/pic/edit.html
+++ b/application/admin/view/pic/edit.html
@@ -18,6 +18,18 @@
</div>
</div>
<div class="form-group">
+ <label class="control-label col-xs-12 col-sm-2">{:__('Text_ids')}:</label>
+ <div class="col-xs-12 col-sm-8">
+ <input id="c-text_ids" data-source="words/index" data-multiple="true" data-field="name" data-params='{"custom[type]":"2"}' class="form-control selectpage" name="row[text_ids]" type="text" value="{$row.text_ids}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label col-xs-12 col-sm-2">{:__('Address_ids')}:</label>
+ <div class="col-xs-12 col-sm-8">
+ <input id="c-address_ids" data-source="words/index" data-multiple="true" data-field="name" data-params='{"custom[type]":"1"}' class="form-control selectpage" name="row[address_ids]" type="text" value="{$row.address_ids}">
+ </div>
+ </div>
+ <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" value="{$row.keyword|htmlentities}">
@@ -38,20 +50,6 @@
</div>
</div>
<div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
- <div class="col-xs-12 col-sm-8">
- <div class="input-group">
- <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" value="{$row.share}" placeholder="请上传图片(400px*400px)">
- <div class="input-group-addon no-border no-padding">
- <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
- <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
- </div>
- <span class="msg-box n-right"></span>
- </div>
- <ul class="row list-inline plupload-preview" id="p-share"></ul>
- </div>
- </div>
- <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}">
@@ -84,12 +82,6 @@
</div>
</div>
<div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-code" class="form-control" name="row[code]" type="text" value="{$row.code|htmlentities}" placeholder="请输入提取码">
- </div>
- </div>
- <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-price" data-rule="required" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入普通价格">
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index b0015e7..edbdd39 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -273,133 +273,151 @@ class User extends Api
if(empty($param['type_id'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
- $all_ids = [];
- $qu_all_ids = [];
-
- //接收传递过来用户输入的关键字
- if(!empty($param['keyword'])){
- $keyword = explode(' ',$param['keyword']);
- $shu_ids = [];
- foreach ($keyword as $v){
- $shu_id = Db::name('video')
- ->where('keyword','like',"%$v%")
- ->column('id');
- foreach ($shu_id as $val){
- array_push($shu_ids,$val);
- }
- }
- $qu_shu_ids = array_unique($shu_ids);
- array_push($all_ids,$qu_shu_ids);
- }
-
- //判断如果传递过来地名关键词不为空
- if(!empty($param['address'])){
- $video_ids = [];
- foreach ($param['address'] as $v){
- //查出该关键词对应的ID
- $words = Db::name('words')
- ->where('name',$v)
- ->field('id,name')
- ->find();
- //所有素材中查出含有该关键词ID的数据
- $address_id = ','.$words['id'].',';
- $video_list = Db::name('video')
- ->where('address_ids','like',"%$address_id%")
- ->column('id');
- foreach ($video_list as $v){
- array_push($video_ids,$v);
+
+ if($param['type_id'] == 1){
+ $all_ids = [];
+ $qu_all_ids = [];
+ //接收传递过来用户输入的关键字
+ if(!empty($param['keyword'])){
+ $keyword = explode(' ',$param['keyword']);
+ $shu_ids = [];
+ foreach ($keyword as $v){
+ $shu_id = Db::name('video')
+ ->where('keyword','like',"%$v%")
+ ->column('id');
+ foreach ($shu_id as $val){
+ array_push($shu_ids,$val);
+ }
}
+ $qu_shu_ids = array_unique($shu_ids);
+ array_push($all_ids,$qu_shu_ids);
}
- //去重成为新的数组
- $new_video_ids = array_unique($video_ids);
- //判断去重以后数组跟原始数组是否一致
- if($video_ids === $new_video_ids){
- $addressids = $video_ids;
- }else{
- $addressids = array_diff_assoc($video_ids,array_unique($video_ids));
- }
- array_push($all_ids,$addressids);
- }
- //判断如果传递过来内容关键词不为空
- if(!empty($param['text'])){
- $video_ids = [];
- foreach ($param['text'] as $v){
- //查出该关键词对应的ID
- $words = Db::name('words')
- ->where('name',$v)
- ->field('id,name')
- ->find();
- //所有素材中查出含有该关键词ID的数据
- $text_id = ','.$words['id'].',';
- $video_list = Db::name('video')
- ->where('text_ids','like',"%$text_id%")
- ->column('id');
- foreach ($video_list as $v){
- array_push($video_ids,$v);
+ //判断如果传递过来地名关键词不为空
+ if(!empty($param['address'])){
+ $video_ids = [];
+ foreach ($param['address'] as $v){
+ //查出该关键词对应的ID
+ $words = Db::name('words')
+ ->where('name',$v)
+ ->field('id,name')
+ ->find();
+ //所有素材中查出含有该关键词ID的数据
+ $address_id = ','.$words['id'].',';
+ $video_list = Db::name('video')
+ ->where('address_ids','like',"%$address_id%")
+ ->column('id');
+ foreach ($video_list as $v){
+ array_push($video_ids,$v);
+ }
}
+ //去重成为新的数组
+ $new_video_ids = array_unique($video_ids);
+ //判断去重以后数组跟原始数组是否一致
+ if($video_ids === $new_video_ids){
+ $addressids = $video_ids;
+ }else{
+ $addressids = array_diff_assoc($video_ids,array_unique($video_ids));
+ }
+
+ array_push($all_ids,$addressids);
}
- //去重成为新的数组
- $new_video_ids = array_unique($video_ids);
- //判断去重以后数组跟原始数组是否一致
- if($video_ids === $new_video_ids){
- $textids = $video_ids;
- }else{
- $textids = array_diff_assoc($video_ids,array_unique($video_ids));
- }
- array_push($all_ids,$textids);
- }
- //判断如果传递过来的价格关键字如果不为空
- if(!empty($param['price'])){
- $price_ids = [];
- $a = [];
- foreach ($param['price'] as $v){
- if($v == '800元'){
- $video_one = Db::name('video')
- ->where('price',800)
+ //判断如果传递过来内容关键词不为空
+ if(!empty($param['text'])){
+ $video_ids = [];
+ foreach ($param['text'] as $v){
+ //查出该关键词对应的ID
+ $words = Db::name('words')
+ ->where('name',$v)
+ ->field('id,name')
+ ->find();
+ //所有素材中查出含有该关键词ID的数据
+ $text_id = ','.$words['id'].',';
+ $video_list = Db::name('video')
+ ->where('text_ids','like',"%$text_id%")
->column('id');
- array_push($a,$video_one);
+ foreach ($video_list as $v){
+ array_push($video_ids,$v);
+ }
}
- if($v == '1200元'){
- $video_two = Db::name('video')
- ->where('price',1200)
- ->column('id');
- array_push($a,$video_two);
+ //去重成为新的数组
+ $new_video_ids = array_unique($video_ids);
+ //判断去重以后数组跟原始数组是否一致
+ if($video_ids === $new_video_ids){
+ $textids = $video_ids;
+ }else{
+ $textids = array_diff_assoc($video_ids,array_unique($video_ids));
}
- if($v == '1800元'){
- $video_three = Db::name('video')
- ->where('price',1800)
- ->column('id');
- array_push($a,$video_three);
+ array_push($all_ids,$textids);
+ }
+
+ //判断如果传递过来的价格关键字如果不为空
+ if(!empty($param['price'])){
+ $price_ids = [];
+ $a = [];
+ foreach ($param['price'] as $v){
+ if($v == '800元'){
+ $video_one = Db::name('video')
+ ->where('price',800)
+ ->column('id');
+ array_push($a,$video_one);
+ }
+ if($v == '1200元'){
+ $video_two = Db::name('video')
+ ->where('price',1200)
+ ->column('id');
+ array_push($a,$video_two);
+ }
+ if($v == '1800元'){
+ $video_three = Db::name('video')
+ ->where('price',1800)
+ ->column('id');
+ array_push($a,$video_three);
+ }
+ }
+ foreach ($a as $val){
+ foreach ($val as $v){
+ array_push($price_ids,$v);
+ }
}
+ array_push($all_ids,$price_ids);
}
- foreach ($a as $val){
+
+ foreach ($all_ids as $val){
foreach ($val as $v){
- array_push($price_ids,$v);
+ array_push($qu_all_ids,$v);
}
}
- array_push($all_ids,$price_ids);
- }
-
- foreach ($all_ids as $val){
- foreach ($val as $v){
- array_push($qu_all_ids,$v);
+ $old_ids = array_unique($qu_all_ids);
+ if($old_ids === $qu_all_ids){
+ //全部视频素材
+ $list = Db::name('video')
+ ->whereIn('id',$old_ids)
+ ->field('id,title,thumbnail')
+ ->page($page,$pageNum)
+ ->select();
+ foreach ($list as &$v){
+ $v['thumbnail'] = $rule.$v['thumbnail'];
+ }
+ $this->success('success',$list);
+ }else{
+ $abc = array_diff_assoc($qu_all_ids,array_unique($qu_all_ids));
+ //全部视频素材
+ $list = Db::name('video')
+ ->whereIn('id',$abc)
+ ->field('id,title,thumbnail')
+ ->page($page,$pageNum)
+ ->select();
+ foreach ($list as &$v){
+ $v['thumbnail'] = $rule.$v['thumbnail'];
+ }
+ $this->success('success',$list);
}
+ }else{
+ echo 456;die;
}
- $abc = array_diff_assoc($qu_all_ids,array_unique($qu_all_ids));
-
- //全部视频素材
- $list = Db::name('video')
- ->whereIn('id',$abc)
- ->field('id,title,thumbnail')
- ->page($page,$pageNum)
- ->select();
- foreach ($list as &$v){
- $v['thumbnail'] = $rule.$v['thumbnail'];
- }
- $this->success('success',$list);
}
/**
@@ -644,9 +662,23 @@ class User extends Api
->where('id',1)
->find();
$data = Db::name('pic')
- ->field('id,title,thumbnail,price,water_url,url,code,content,click_num,share')
+ ->field('text_ids,address_ids,id,keyword,title,thumbnail,price,water_url,url,code,content,click_num')
->where('id',$pic_id)
->find();
+ $keyword = str_replace(' ',',',$data['keyword']);
+
+ //单取出所有关键字合并数组
+ $text_ids = explode(',',trim($data['text_ids'],','));
+ $address_ids = explode(',',trim($data['address_ids'],','));
+ $words = array_merge($text_ids,$address_ids);
+ $keywords = Db::name('words')
+ ->whereIn('id',$words)
+ ->column('name');
+ $keywords = implode(',',$keywords);
+ $key = $keywords.','.$keyword;
+ $a = trim($key,',');
+ $data['keyword'] = explode(',',$a);
+
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
@@ -656,7 +688,6 @@ class User extends Api
$data['water_url'] = $rule.$data['water_url'];
$data['vip_price'] = $data['price'] * 0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
- $data['share'] = $rule.$data['share'];
$data['content'] = strip_tags($data['content']);
$data['is_vip'] = 0;
$this->success('SUCCESS',$data);
@@ -666,9 +697,23 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('pic')
- ->field('id,title,thumbnail,price,water_url,url,code,content,click_num,share')
+ ->field('text_ids,address_ids,keyword,id,title,thumbnail,price,water_url,url,code,content,click_num')
->where('id',$pic_id)
->find();
+ $keyword = str_replace(' ',',',$data['keyword']);
+
+ //单取出所有关键字合并数组
+ $text_ids = explode(',',trim($data['text_ids'],','));
+ $address_ids = explode(',',trim($data['address_ids'],','));
+ $words = array_merge($text_ids,$address_ids);
+ $keywords = Db::name('words')
+ ->whereIn('id',$words)
+ ->column('name');
+ $keywords = implode(',',$keywords);
+ $key = $keywords.','.$keyword;
+ $a = trim($key,',');
+ $data['keyword'] = explode(',',$a);
+
$accredit = Db::name('accredit')
->where('id',1)
->find();
@@ -682,7 +727,6 @@ class User extends Api
$data['water_url'] = $rule.$data['water_url'];
$data['vip_price'] = $data['price'] * 0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
- $data['share'] = $rule.$data['share'];
$data['content'] = strip_tags($data['content']);
$this->success('SUCCESS',$data);
}
diff --git a/public/api.html b/public/api.html
index 2ecd4f6..7fa0416 100644
--- a/public/api.html
+++ b/public/api.html
@@ -139,27 +139,27 @@
<!-- menu -->
<div id="sidebar">
<div class="list-group panel">
- <a href="#支付接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">支付接口 <i class="fa fa-caret-down"></i></a>
- <div class="child collapse" id="支付接口">
- <a href="javascript:;" data-id="0" class="list-group-item">充值支付</a>
- <a href="javascript:;" data-id="1" class="list-group-item">开通会员支付</a>
- <a href="javascript:;" data-id="2" class="list-group-item">图片购买支付</a>
- <a href="javascript:;" data-id="3" class="list-group-item"></a>
- <a href="javascript:;" data-id="4" class="list-group-item"></a>
- <a href="javascript:;" data-id="5" class="list-group-item"></a>
- <a href="javascript:;" data-id="6" class="list-group-item"></a>
- <a href="javascript:;" data-id="7" class="list-group-item"></a>
- <a href="javascript:;" data-id="8" class="list-group-item"></a>
- </div>
<a href="#公共接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">公共接口 <i class="fa fa-caret-down"></i></a>
<div class="child collapse" id="公共接口">
- <a href="javascript:;" data-id="9" class="list-group-item"></a>
- <a href="javascript:;" data-id="10" class="list-group-item">加载初始化</a>
- <a href="javascript:;" data-id="11" class="list-group-item">上传文件</a>
- <a href="javascript:;" data-id="12" class="list-group-item"></a>
+ <a href="javascript:;" data-id="0" class="list-group-item"></a>
+ <a href="javascript:;" data-id="1" class="list-group-item">加载初始化</a>
+ <a href="javascript:;" data-id="2" class="list-group-item">上传文件</a>
+ <a href="javascript:;" data-id="3" class="list-group-item"></a>
</div>
<a href="#" class="list-group-item" data-toggle="collapse" data-parent="#sidebar"> <i class="fa fa-caret-down"></i></a>
<div class="child collapse" id="">
+ <a href="javascript:;" data-id="4" class="list-group-item"></a>
+ </div>
+ <a href="#支付接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">支付接口 <i class="fa fa-caret-down"></i></a>
+ <div class="child collapse" id="支付接口">
+ <a href="javascript:;" data-id="5" class="list-group-item">充值支付</a>
+ <a href="javascript:;" data-id="6" class="list-group-item">开通会员支付</a>
+ <a href="javascript:;" data-id="7" class="list-group-item">图片购买支付</a>
+ <a href="javascript:;" data-id="8" class="list-group-item"></a>
+ <a href="javascript:;" data-id="9" class="list-group-item"></a>
+ <a href="javascript:;" data-id="10" class="list-group-item"></a>
+ <a href="javascript:;" data-id="11" class="list-group-item"></a>
+ <a href="javascript:;" data-id="12" class="list-group-item"></a>
<a href="javascript:;" data-id="13" class="list-group-item"></a>
</div>
<a href="#Token接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">Token接口 <i class="fa fa-caret-down"></i></a>
@@ -212,13 +212,13 @@
</div>
</div>
<div class="panel-group" id="accordion">
- <h2>支付接口</h2>
+ <h2>公共接口</h2>
<hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-0">
<h4 class="panel-title">
- <span class="label label-primary">POST</span>
- <a data-toggle="collapse" data-parent="#accordion0" href="#collapseOne0"> 充值支付 <span class="text-muted">/api/pay/pay</span></a>
+ <span class="label label-success">GET</span>
+ <a data-toggle="collapse" data-parent="#accordion0" href="#collapseOne0"> <span class="text-muted">/api/common/test_pdf</span></a>
</h4>
</div>
<div id="collapseOne0" class="panel-collapse collapse">
@@ -236,51 +236,17 @@
<div class="tab-pane active" id="info0">
<div class="well">
- 充值支付 </div>
+ </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
- <table class="table table-hover">
- <thead>
- <tr>
- <th>名称</th>
- <th>类型</th>
- <th>必选</th>
- <th>描述</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>token</td>
- <td>string</td>
- <td>是</td>
- <td>请求的Token</td>
- </tr>
- </tbody>
- </table>
+ 无
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <table class="table table-hover">
- <thead>
- <tr>
- <th>名称</th>
- <th>类型</th>
- <th>必选</th>
- <th>描述</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>order_id</td>
- <td>inter</td>
- <td>是</td>
- <td>订单id</td>
- </tr>
- </tbody>
- </table>
+ 无
</div>
</div>
<div class="panel panel-default">
@@ -294,23 +260,11 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
- <div class="panel-heading"><strong>Headers</strong></div>
- <div class="panel-body">
- <div class="headers">
- <div class="form-group">
- <label class="control-label" for="token">token</label>
- <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
- </div>
- </div>
- </div>
- </div>
- <div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/pay" method="POST" name="form0" id="form0">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/test_pdf" method="get" name="form0" id="form0">
<div class="form-group">
- <label class="control-label" for="order_id">order_id</label>
- <input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
+ 无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="0">提交</button>
@@ -355,8 +309,8 @@
<div class="panel panel-default">
<div class="panel-heading" id="heading-1">
<h4 class="panel-title">
- <span class="label label-primary">POST</span>
- <a data-toggle="collapse" data-parent="#accordion1" href="#collapseOne1"> 开通会员支付 <span class="text-muted">/api/pay/vippay</span></a>
+ <span class="label label-success">GET</span>
+ <a data-toggle="collapse" data-parent="#accordion1" href="#collapseOne1"> 加载初始化 <span class="text-muted">/api/common/init</span></a>
</h4>
</div>
<div id="collapseOne1" class="panel-collapse collapse">
@@ -374,28 +328,11 @@
<div class="tab-pane active" id="info1">
<div class="well">
- 开通会员支付 </div>
+ 加载初始化 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
- <table class="table table-hover">
- <thead>
- <tr>
- <th>名称</th>
- <th>类型</th>
- <th>必选</th>
- <th>描述</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>token</td>
- <td>string</td>
- <td>是</td>
- <td>请求的Token</td>
- </tr>
- </tbody>
- </table>
+ 无
</div>
</div>
<div class="panel panel-default">
@@ -412,10 +349,22 @@
</thead>
<tbody>
<tr>
- <td>order_id</td>
- <td>inter</td>
+ <td>version</td>
+ <td>string</td>
<td>是</td>
- <td>订单id</td>
+ <td>版本号</td>
+ </tr>
+ <tr>
+ <td>lng</td>
+ <td>string</td>
+ <td>是</td>
+ <td>经度</td>
+ </tr>
+ <tr>
+ <td>lat</td>
+ <td>string</td>
+ <td>是</td>
+ <td>纬度</td>
</tr>
</tbody>
</table>
@@ -432,23 +381,20 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
- <div class="panel-heading"><strong>Headers</strong></div>
+ <div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <div class="headers">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/init" method="get" name="form1" id="form1">
<div class="form-group">
- <label class="control-label" for="token">token</label>
- <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
+ <label class="control-label" for="version">version</label>
+ <input type="string" class="form-control input-sm" id="version" required placeholder="版本号" name="version">
</div>
- </div>
- </div>
- </div>
- <div class="panel panel-default">
- <div class="panel-heading"><strong>参数</strong></div>
- <div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/vippay" method="POST" name="form1" id="form1">
<div class="form-group">
- <label class="control-label" for="order_id">order_id</label>
- <input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
+ <label class="control-label" for="lng">lng</label>
+ <input type="string" class="form-control input-sm" id="lng" required placeholder="经度" name="lng">
+ </div>
+ <div class="form-group">
+ <label class="control-label" for="lat">lat</label>
+ <input type="string" class="form-control input-sm" id="lat" required placeholder="纬度" name="lat">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="1">提交</button>
@@ -494,7 +440,7 @@
<div class="panel-heading" id="heading-2">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
- <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne2"> 图片购买支付 <span class="text-muted">/api/pay/picpay</span></a>
+ <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne2"> 上传文件 <span class="text-muted">/api/common/upload</span></a>
</h4>
</div>
<div id="collapseOne2" class="panel-collapse collapse">
@@ -512,28 +458,11 @@
<div class="tab-pane active" id="info2">
<div class="well">
- 图片购买支付 </div>
+ 上传文件 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
- <table class="table table-hover">
- <thead>
- <tr>
- <th>名称</th>
- <th>类型</th>
- <th>必选</th>
- <th>描述</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>token</td>
- <td>string</td>
- <td>是</td>
- <td>请求的Token</td>
- </tr>
- </tbody>
- </table>
+ 无
</div>
</div>
<div class="panel panel-default">
@@ -550,16 +479,10 @@
</thead>
<tbody>
<tr>
- <td>order_id</td>
- <td>inter</td>
- <td>是</td>
- <td>订单id</td>
- </tr>
- <tr>
- <td>type</td>
- <td>inter</td>
+ <td>file</td>
+ <td>File</td>
<td>是</td>
- <td>支付方式 1 为余额支付 2为微信支付</td>
+ <td>文件流</td>
</tr>
</tbody>
</table>
@@ -576,27 +499,12 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
- <div class="panel-heading"><strong>Headers</strong></div>
- <div class="panel-body">
- <div class="headers">
- <div class="form-group">
- <label class="control-label" for="token">token</label>
- <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
- </div>
- </div>
- </div>
- </div>
- <div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/picpay" method="POST" name="form2" id="form2">
- <div class="form-group">
- <label class="control-label" for="order_id">order_id</label>
- <input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
- </div>
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/upload" method="POST" name="form2" id="form2">
<div class="form-group">
- <label class="control-label" for="type">type</label>
- <input type="inter" class="form-control input-sm" id="type" required placeholder="支付方式 1 为余额支付 2为微信支付" name="type">
+ <label class="control-label" for="file">file</label>
+ <input type="File" class="form-control input-sm" id="file" required placeholder="文件流" name="file">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="2">提交</button>
@@ -642,7 +550,7 @@
<div class="panel-heading" id="heading-3">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion3" href="#collapseOne3"> <span class="text-muted">/api/pay/sms</span></a>
+ <a data-toggle="collapse" data-parent="#accordion3" href="#collapseOne3"> <span class="text-muted">/api/common/send</span></a>
</h4>
</div>
<div id="collapseOne3" class="panel-collapse collapse">
@@ -686,7 +594,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/sms" method="get" name="form3" id="form3">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/send" method="get" name="form3" id="form3">
<div class="form-group">
无
</div>
@@ -730,11 +638,13 @@
</div>
</div>
</div>
+ <h2></h2>
+ <hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-4">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion4" href="#collapseOne4"> <span class="text-muted">/api/pay/send_sms</span></a>
+ <a data-toggle="collapse" data-parent="#accordion4" href="#collapseOne4"> <span class="text-muted">/api/notify/picOrderNotify</span></a>
</h4>
</div>
<div id="collapseOne4" class="panel-collapse collapse">
@@ -778,7 +688,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/send_sms" method="get" name="form4" id="form4">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/notify/picOrderNotify" method="get" name="form4" id="form4">
<div class="form-group">
无
</div>
@@ -822,11 +732,13 @@
</div>
</div>
</div>
+ <h2>支付接口</h2>
+ <hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-5">
<h4 class="panel-title">
- <span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion5" href="#collapseOne5"> <span class="text-muted">/api/pay/payOrderNotify</span></a>
+ <span class="label label-primary">POST</span>
+ <a data-toggle="collapse" data-parent="#accordion5" href="#collapseOne5"> 充值支付 <span class="text-muted">/api/pay/pay</span></a>
</h4>
</div>
<div id="collapseOne5" class="panel-collapse collapse">
@@ -844,17 +756,51 @@
<div class="tab-pane active" id="info5">
<div class="well">
- </div>
+ 充值支付 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
- 无
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>名称</th>
+ <th>类型</th>
+ <th>必选</th>
+ <th>描述</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>token</td>
+ <td>string</td>
+ <td>是</td>
+ <td>请求的Token</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- 无
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>名称</th>
+ <th>类型</th>
+ <th>必选</th>
+ <th>描述</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>order_id</td>
+ <td>inter</td>
+ <td>是</td>
+ <td>订单id</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
<div class="panel panel-default">
@@ -868,11 +814,23 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
+ <div class="panel-heading"><strong>Headers</strong></div>
+ <div class="panel-body">
+ <div class="headers">
+ <div class="form-group">
+ <label class="control-label" for="token">token</label>
+ <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/payOrderNotify" method="get" name="form5" id="form5">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/pay" method="POST" name="form5" id="form5">
<div class="form-group">
- 无
+ <label class="control-label" for="order_id">order_id</label>
+ <input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="5">提交</button>
@@ -917,8 +875,8 @@
<div class="panel panel-default">
<div class="panel-heading" id="heading-6">
<h4 class="panel-title">
- <span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion6" href="#collapseOne6"> <span class="text-muted">/api/pay/vippayOrderNotify</span></a>
+ <span class="label label-primary">POST</span>
+ <a data-toggle="collapse" data-parent="#accordion6" href="#collapseOne6"> 开通会员支付 <span class="text-muted">/api/pay/vippay</span></a>
</h4>
</div>
<div id="collapseOne6" class="panel-collapse collapse">
@@ -936,17 +894,51 @@
<div class="tab-pane active" id="info6">
<div class="well">
- </div>
+ 开通会员支付 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
- 无
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>名称</th>
+ <th>类型</th>
+ <th>必选</th>
+ <th>描述</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>token</td>
+ <td>string</td>
+ <td>是</td>
+ <td>请求的Token</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- 无
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>名称</th>
+ <th>类型</th>
+ <th>必选</th>
+ <th>描述</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>order_id</td>
+ <td>inter</td>
+ <td>是</td>
+ <td>订单id</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
<div class="panel panel-default">
@@ -960,11 +952,23 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
+ <div class="panel-heading"><strong>Headers</strong></div>
+ <div class="panel-body">
+ <div class="headers">
+ <div class="form-group">
+ <label class="control-label" for="token">token</label>
+ <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/vippayOrderNotify" method="get" name="form6" id="form6">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/vippay" method="POST" name="form6" id="form6">
<div class="form-group">
- 无
+ <label class="control-label" for="order_id">order_id</label>
+ <input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="6">提交</button>
@@ -1009,8 +1013,8 @@
<div class="panel panel-default">
<div class="panel-heading" id="heading-7">
<h4 class="panel-title">
- <span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion7" href="#collapseOne7"> <span class="text-muted">/api/pay/picOrderNotify</span></a>
+ <span class="label label-primary">POST</span>
+ <a data-toggle="collapse" data-parent="#accordion7" href="#collapseOne7"> 图片购买支付 <span class="text-muted">/api/pay/picpay</span></a>
</h4>
</div>
<div id="collapseOne7" class="panel-collapse collapse">
@@ -1028,17 +1032,57 @@
<div class="tab-pane active" id="info7">
<div class="well">
- </div>
+ 图片购买支付 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
- 无
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>名称</th>
+ <th>类型</th>
+ <th>必选</th>
+ <th>描述</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>token</td>
+ <td>string</td>
+ <td>是</td>
+ <td>请求的Token</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- 无
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th>名称</th>
+ <th>类型</th>
+ <th>必选</th>
+ <th>描述</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>order_id</td>
+ <td>inter</td>
+ <td>是</td>
+ <td>订单id</td>
+ </tr>
+ <tr>
+ <td>type</td>
+ <td>inter</td>
+ <td>是</td>
+ <td>支付方式 1 为余额支付 2为微信支付</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
<div class="panel panel-default">
@@ -1052,11 +1096,27 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
+ <div class="panel-heading"><strong>Headers</strong></div>
+ <div class="panel-body">
+ <div class="headers">
+ <div class="form-group">
+ <label class="control-label" for="token">token</label>
+ <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/picOrderNotify" method="get" name="form7" id="form7">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/picpay" method="POST" name="form7" id="form7">
<div class="form-group">
- 无
+ <label class="control-label" for="order_id">order_id</label>
+ <input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
+ </div>
+ <div class="form-group">
+ <label class="control-label" for="type">type</label>
+ <input type="inter" class="form-control input-sm" id="type" required placeholder="支付方式 1 为余额支付 2为微信支付" name="type">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="7">提交</button>
@@ -1102,7 +1162,7 @@
<div class="panel-heading" id="heading-8">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion8" href="#collapseOne8"> <span class="text-muted">/api/pay/getopenid</span></a>
+ <a data-toggle="collapse" data-parent="#accordion8" href="#collapseOne8"> <span class="text-muted">/api/pay/sms</span></a>
</h4>
</div>
<div id="collapseOne8" class="panel-collapse collapse">
@@ -1146,7 +1206,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/getopenid" method="get" name="form8" id="form8">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/sms" method="get" name="form8" id="form8">
<div class="form-group">
无
</div>
@@ -1190,13 +1250,11 @@
</div>
</div>
</div>
- <h2>公共接口</h2>
- <hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-9">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion9" href="#collapseOne9"> <span class="text-muted">/api/common/test_pdf</span></a>
+ <a data-toggle="collapse" data-parent="#accordion9" href="#collapseOne9"> <span class="text-muted">/api/pay/send_sms</span></a>
</h4>
</div>
<div id="collapseOne9" class="panel-collapse collapse">
@@ -1240,7 +1298,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/test_pdf" method="get" name="form9" id="form9">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/send_sms" method="get" name="form9" id="form9">
<div class="form-group">
无
</div>
@@ -1288,7 +1346,7 @@
<div class="panel-heading" id="heading-10">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion10" href="#collapseOne10"> 加载初始化 <span class="text-muted">/api/common/init</span></a>
+ <a data-toggle="collapse" data-parent="#accordion10" href="#collapseOne10"> <span class="text-muted">/api/pay/payOrderNotify</span></a>
</h4>
</div>
<div id="collapseOne10" class="panel-collapse collapse">
@@ -1306,7 +1364,7 @@
<div class="tab-pane active" id="info10">
<div class="well">
- 加载初始化 </div>
+ </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
@@ -1316,36 +1374,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <table class="table table-hover">
- <thead>
- <tr>
- <th>名称</th>
- <th>类型</th>
- <th>必选</th>
- <th>描述</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>version</td>
- <td>string</td>
- <td>是</td>
- <td>版本号</td>
- </tr>
- <tr>
- <td>lng</td>
- <td>string</td>
- <td>是</td>
- <td>经度</td>
- </tr>
- <tr>
- <td>lat</td>
- <td>string</td>
- <td>是</td>
- <td>纬度</td>
- </tr>
- </tbody>
- </table>
+ 无
</div>
</div>
<div class="panel panel-default">
@@ -1361,18 +1390,9 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/init" method="get" name="form10" id="form10">
- <div class="form-group">
- <label class="control-label" for="version">version</label>
- <input type="string" class="form-control input-sm" id="version" required placeholder="版本号" name="version">
- </div>
- <div class="form-group">
- <label class="control-label" for="lng">lng</label>
- <input type="string" class="form-control input-sm" id="lng" required placeholder="经度" name="lng">
- </div>
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/payOrderNotify" method="get" name="form10" id="form10">
<div class="form-group">
- <label class="control-label" for="lat">lat</label>
- <input type="string" class="form-control input-sm" id="lat" required placeholder="纬度" name="lat">
+ 无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="10">提交</button>
@@ -1417,8 +1437,8 @@
<div class="panel panel-default">
<div class="panel-heading" id="heading-11">
<h4 class="panel-title">
- <span class="label label-primary">POST</span>
- <a data-toggle="collapse" data-parent="#accordion11" href="#collapseOne11"> 上传文件 <span class="text-muted">/api/common/upload</span></a>
+ <span class="label label-success">GET</span>
+ <a data-toggle="collapse" data-parent="#accordion11" href="#collapseOne11"> <span class="text-muted">/api/pay/vippayOrderNotify</span></a>
</h4>
</div>
<div id="collapseOne11" class="panel-collapse collapse">
@@ -1436,7 +1456,7 @@
<div class="tab-pane active" id="info11">
<div class="well">
- 上传文件 </div>
+ </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
@@ -1446,24 +1466,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <table class="table table-hover">
- <thead>
- <tr>
- <th>名称</th>
- <th>类型</th>
- <th>必选</th>
- <th>描述</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>file</td>
- <td>File</td>
- <td>是</td>
- <td>文件流</td>
- </tr>
- </tbody>
- </table>
+ 无
</div>
</div>
<div class="panel panel-default">
@@ -1479,10 +1482,9 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/upload" method="POST" name="form11" id="form11">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/vippayOrderNotify" method="get" name="form11" id="form11">
<div class="form-group">
- <label class="control-label" for="file">file</label>
- <input type="File" class="form-control input-sm" id="file" required placeholder="文件流" name="file">
+ 无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="11">提交</button>
@@ -1528,7 +1530,7 @@
<div class="panel-heading" id="heading-12">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion12" href="#collapseOne12"> <span class="text-muted">/api/common/send</span></a>
+ <a data-toggle="collapse" data-parent="#accordion12" href="#collapseOne12"> <span class="text-muted">/api/pay/picOrderNotify</span></a>
</h4>
</div>
<div id="collapseOne12" class="panel-collapse collapse">
@@ -1572,7 +1574,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/common/send" method="get" name="form12" id="form12">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/picOrderNotify" method="get" name="form12" id="form12">
<div class="form-group">
无
</div>
@@ -1616,13 +1618,11 @@
</div>
</div>
</div>
- <h2></h2>
- <hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-13">
<h4 class="panel-title">
<span class="label label-success">GET</span>
- <a data-toggle="collapse" data-parent="#accordion13" href="#collapseOne13"> <span class="text-muted">/api/notify/picOrderNotify</span></a>
+ <a data-toggle="collapse" data-parent="#accordion13" href="#collapseOne13"> <span class="text-muted">/api/pay/getopenid</span></a>
</h4>
</div>
<div id="collapseOne13" class="panel-collapse collapse">
@@ -1666,7 +1666,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
- <form enctype="application/x-www-form-urlencoded" role="form" action="/api/notify/picOrderNotify" method="get" name="form13" id="form13">
+ <form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/getopenid" method="get" name="form13" id="form13">
<div class="form-group">
无
</div>
@@ -7530,7 +7530,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2020-03-10 15:00:42 </div>
+ Generated on 2020-03-10 17:22:26 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
diff --git a/public/assets/js/backend/pic.js b/public/assets/js/backend/pic.js
index fb9e66d..4867bfc 100644
--- a/public/assets/js/backend/pic.js
+++ b/public/assets/js/backend/pic.js
@@ -29,14 +29,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'number', title: __('Number')},
{field: 'is_show', title: __('Is_show'),operate:false},
{field: 'title', title: __('Title'),operate:false},
+ {field: 'text_ids', title: __('Text_ids'),searchList:$.getJSON('pic/text')},
+ {field: 'address_ids', title: __('Address_ids'),searchList:$.getJSON('pic/address')},
{field: 'keyword', title: __('Keyword'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
- {field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: '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},
{field: 'price', title: __('Price'),operate:false},
{field: 'buy_num', title: __('Buy_num'),operate:false},
{field: 'money', title: __('Money'),operate:false},
--
libgit2 0.24.0