From 0d0aca4c530f7877689f8052596ccb70ea43d679 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Sat, 7 Dec 2019 10:31:02 +0800
Subject: [PATCH] 修改后台图片类型

---
 .idea/workspace.xml                       |  636 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 application/admin/controller/Pic.php      |   14 ++++++++++++++
 application/admin/controller/Pictype.php  |   35 +++++++++++++++++++++++++++++++++++
 application/admin/lang/zh-cn/pic.php      |    1 +
 application/admin/lang/zh-cn/pictype.php  |    9 +++++++++
 application/admin/model/Pictype.php       |   38 ++++++++++++++++++++++++++++++++++++++
 application/admin/validate/Pictype.php    |   27 +++++++++++++++++++++++++++
 application/admin/view/pic/add.html       |    6 ++++++
 application/admin/view/pic/edit.html      |    6 ++++++
 application/admin/view/pictype/add.html   |   30 ++++++++++++++++++++++++++++++
 application/admin/view/pictype/edit.html  |   30 ++++++++++++++++++++++++++++++
 application/admin/view/pictype/index.html |   35 +++++++++++++++++++++++++++++++++++
 application/admin/view/type/edit.html     |    2 +-
 application/api/controller/User.php       |   33 +++++++++++++++++++++++++++++++++
 public/api.html                           | 1230 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 public/assets/js/backend/pic.js           |    1 +
 public/assets/js/backend/pictype.js       |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 17 files changed, 1329 insertions(+), 857 deletions(-)
 create mode 100644 application/admin/controller/Pictype.php
 create mode 100644 application/admin/lang/zh-cn/pictype.php
 create mode 100644 application/admin/model/Pictype.php
 create mode 100644 application/admin/validate/Pictype.php
 create mode 100644 application/admin/view/pictype/add.html
 create mode 100644 application/admin/view/pictype/edit.html
 create mode 100644 application/admin/view/pictype/index.html
 create mode 100644 public/assets/js/backend/pictype.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0fb43e7..f1eb281 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,22 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Pic.php" afterPath="$PROJECT_DIR$/application/admin/controller/Pic.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" afterPath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/type/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/type/edit.html" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -27,7 +20,66 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="63">
+              <caret line="172" column="7" lean-forward="false" selection-start-line="172" selection-start-column="7" selection-end-line="172" selection-end-column="7" />
+              <folding>
+                <element signature="e#2902#3430#0#PHP" expanded="false" />
+                <element signature="e#3435#4571#0#PHP" expanded="false" />
+                <element signature="e#4577#4984#0#PHP" expanded="false" />
+                <element signature="e#4989#5332#0#PHP" expanded="false" />
+                <element signature="e#5338#5751#0#PHP" expanded="false" />
+                <element signature="e#6112#6949#0#PHP" expanded="false" />
+                <element signature="e#6954#9149#0#PHP" expanded="false" />
+                <element signature="e#9155#9800#0#PHP" expanded="false" />
+                <element signature="e#22993#23498#0#PHP" expanded="false" />
+                <element signature="e#23503#23754#0#PHP" expanded="false" />
+                <element signature="e#23760#24239#0#PHP" expanded="false" />
+                <element signature="e#24244#25001#0#PHP" expanded="false" />
+                <element signature="e#25007#25488#0#PHP" expanded="false" />
+                <element signature="e#25493#26263#0#PHP" expanded="false" />
+                <element signature="e#26269#26632#0#PHP" expanded="false" />
+                <element signature="e#26637#26828#0#PHP" expanded="false" />
+                <element signature="e#26834#27192#0#PHP" expanded="false" />
+                <element signature="e#27197#27388#0#PHP" expanded="false" />
+                <element signature="e#27394#28537#0#PHP" expanded="false" />
+                <element signature="e#28542#31207#0#PHP" expanded="false" />
+                <element signature="e#31213#31711#0#PHP" expanded="false" />
+                <element signature="e#31716#33462#0#PHP" expanded="false" />
+                <element signature="e#33468#33881#0#PHP" expanded="false" />
+                <element signature="e#33886#34365#0#PHP" expanded="false" />
+                <element signature="e#34371#34905#0#PHP" expanded="false" />
+                <element signature="e#34910#36295#0#PHP" expanded="false" />
+                <element signature="e#36301#36955#0#PHP" expanded="false" />
+                <element signature="e#36960#38975#0#PHP" expanded="false" />
+                <element signature="e#38981#39741#0#PHP" expanded="false" />
+                <element signature="e#39746#42455#0#PHP" expanded="false" />
+                <element signature="e#42481#43312#0#PHP" expanded="false" />
+                <element signature="e#43318#43738#0#PHP" expanded="false" />
+                <element signature="e#43743#44226#0#PHP" expanded="false" />
+                <element signature="e#44232#45038#0#PHP" expanded="false" />
+                <element signature="e#45043#48197#0#PHP" expanded="false" />
+                <element signature="e#48212#49540#0#PHP" expanded="false" />
+                <element signature="e#49556#50583#0#PHP" expanded="false" />
+                <element signature="e#50589#51347#0#PHP" expanded="false" />
+                <element signature="e#51352#55095#0#PHP" expanded="false" />
+                <element signature="e#55101#55493#0#PHP" expanded="false" />
+                <element signature="e#55498#56450#0#PHP" expanded="false" />
+                <element signature="e#56474#57047#0#PHP" expanded="false" />
+                <element signature="e#57053#57652#0#PHP" expanded="false" />
+                <element signature="e#57657#58584#0#PHP" expanded="false" />
+                <element signature="e#58590#59304#0#PHP" expanded="false" />
+                <element signature="e#59310#59737#0#PHP" expanded="false" />
+                <element signature="e#59742#60211#0#PHP" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
@@ -45,12 +97,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/application/admin/view/video/index.html" />
-        <option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" />
-        <option value="$PROJECT_DIR$/public/assets/js/backend/type.js" />
-        <option value="$PROJECT_DIR$/application/admin/view/type/add.html" />
-        <option value="$PROJECT_DIR$/application/admin/view/type/index.html" />
-        <option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />
         <option value="$PROJECT_DIR$/application/admin/model/Pic.php" />
         <option value="$PROJECT_DIR$/application/admin/model/Type.php" />
         <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" />
@@ -80,12 +126,6 @@
         <option value="$PROJECT_DIR$/application/nsms/nsms.php" />
         <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
         <option value="$PROJECT_DIR$/application/extra/verify.php" />
-        <option value="$PROJECT_DIR$/application/api/controller/User.php" />
-        <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
-        <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
-        <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
-        <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
-        <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
         <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
         <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
         <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
@@ -96,6 +136,18 @@
         <option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
         <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
         <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
+        <option value="$PROJECT_DIR$/application/admin/view/pictype/add.html" />
+        <option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />
+        <option value="$PROJECT_DIR$/application/admin/view/pictype/edit.html" />
+        <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php" />
+        <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
+        <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
+        <option value="$PROJECT_DIR$/application/admin/model/Pictype.php" />
+        <option value="$PROJECT_DIR$/public/assets/js/backend/pictype.js" />
+        <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
+        <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
+        <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
+        <option value="$PROJECT_DIR$/application/api/controller/User.php" />
       </list>
     </option>
   </component>
@@ -113,11 +165,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="42" />
-    <option name="y" value="112" />
-    <option name="width" value="1907" />
-    <option name="height" value="943" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="319" />
+    <option name="y" value="56" />
+    <option name="width" value="1700" />
+    <option name="height" value="1000" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -134,7 +186,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -151,39 +202,21 @@
               <item name="areial" type="b2602c69:ProjectViewProjectNode" />
               <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="areial" type="b2602c69:ProjectViewProjectNode" />
-              <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
             <path>
               <item name="areial" type="b2602c69:ProjectViewProjectNode" />
               <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="areial" type="b2602c69:ProjectViewProjectNode" />
-              <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="areial" type="b2602c69:ProjectViewProjectNode" />
-              <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -256,7 +289,15 @@
       <workItem from="1575340427887" duration="256000" />
       <workItem from="1575420983161" duration="9911000" />
       <workItem from="1575444277051" duration="130000" />
-      <workItem from="1575457595017" duration="3691000" />
+      <workItem from="1575457595017" duration="3898000" />
+      <workItem from="1575462829570" duration="262000" />
+      <workItem from="1575505399026" duration="2520000" />
+      <workItem from="1575527050192" duration="243000" />
+      <workItem from="1575538373568" duration="280000" />
+      <workItem from="1575541798312" duration="2359000" />
+      <workItem from="1575592025964" duration="640000" />
+      <workItem from="1575599624364" duration="95000" />
+      <workItem from="1575680867057" duration="4648000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -269,7 +310,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="303293000" />
+    <option name="totallyTimeSpent" value="314547000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -281,16 +322,16 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="42" y="112" width="1907" height="943" extended-state="1" />
+    <frame x="319" y="56" width="1700" height="1000" extended-state="0" />
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1575528" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19512194" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.10361446" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.10428737" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -333,103 +374,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="12" />
+      <option name="time" value="16" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/extend/nsms/nsms.php" />
-    <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="5" column="17" lean-forward="true" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Order/Client.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="34" column="20" lean-forward="false" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/cert/证书使用说明.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/cert/apiclient_key.pem">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/cert/apiclient_cert.pem">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Reverse/Client.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Factory.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="531">
-          <caret line="79" column="0" lean-forward="true" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/validate/Vip.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/admin/model/Vip.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -458,13 +407,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Desktop/1.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="5" column="114" lean-forward="true" selection-start-line="5" selection-start-column="114" selection-end-line="5" selection-end-column="114" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Desktop/1.html" />
     <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
@@ -507,44 +450,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />
-          <folding>
-            <element signature="e#38#68#0#PHP" expanded="false" />
-            <element signature="e#574#693#0#PHP" expanded="false" />
-            <element signature="e#699#1012#0#PHP" expanded="false" />
-            <element signature="e#1017#3093#0#PHP" expanded="false" />
-            <element signature="e#3099#3419#0#PHP" expanded="false" />
-            <element signature="e#3424#5506#0#PHP" expanded="false" />
-            <element signature="e#5512#5930#0#PHP" expanded="false" />
-            <element signature="e#6179#6269#0#PHP" expanded="false" />
-            <element signature="e#6347#6443#0#PHP" expanded="false" />
-            <element signature="e#7641#7929#0#PHP" expanded="false" />
-            <element signature="e#8006#8279#0#PHP" expanded="false" />
-            <element signature="e#11461#13236#0#PHP" expanded="false" />
-            <element signature="e#13309#13729#0#PHP" expanded="false" />
-            <element signature="e#15368#15656#0#PHP" expanded="false" />
-            <element signature="e#15732#16005#0#PHP" expanded="false" />
-            <element signature="e#16160#16470#0#PHP" expanded="false" />
-            <element signature="e#16545#16996#0#PHP" expanded="false" />
-            <element signature="e#17073#18117#0#PHP" expanded="false" />
-            <element signature="e#18211#18329#0#PHP" expanded="false" />
-            <element signature="e#21048#21345#0#PHP" expanded="false" />
-            <element signature="e#21350#21743#0#PHP" expanded="false" />
-            <element signature="e#21770#25248#0#PHP" expanded="false" />
-            <element signature="e#25277#28182#0#PHP" expanded="false" />
-            <element signature="e#28211#31661#0#PHP" expanded="false" />
-            <element signature="e#29087#29692#0#PHP" expanded="false" />
-            <element signature="e#29713#31150#0#PHP" expanded="false" />
-            <element signature="e#31198#31300#0#PHP" expanded="false" />
-            <element signature="e#31690#35427#0#PHP" expanded="false" />
-            <element signature="e#35450#35667#0#PHP" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
@@ -605,201 +510,320 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="267">
           <caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="20" column="43" lean-forward="false" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="437" column="7" lean-forward="true" selection-start-line="437" selection-start-column="7" selection-end-line="437" selection-end-column="7" />
+        <state relative-caret-position="125">
+          <caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="28" column="63" lean-forward="false" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="373">
+          <caret line="40" column="26" lean-forward="false" selection-start-line="40" selection-start-column="26" selection-end-line="40" selection-end-column="26" />
           <folding>
-            <element signature="e#365#484#0#PHP" expanded="false" />
-            <element signature="e#490#1228#0#PHP" expanded="false" />
-            <element signature="e#1233#2896#0#PHP" expanded="false" />
-            <element signature="e#2902#3430#0#PHP" expanded="false" />
-            <element signature="e#3435#4571#0#PHP" expanded="false" />
-            <element signature="e#4577#4984#0#PHP" expanded="false" />
-            <element signature="e#4989#5332#0#PHP" expanded="false" />
-            <element signature="e#5338#6175#0#PHP" expanded="false" />
-            <element signature="e#6180#8375#0#PHP" expanded="false" />
-            <element signature="e#8381#9026#0#PHP" expanded="false" />
-            <element signature="e#9031#10127#0#PHP" expanded="false" />
-            <element signature="e#10133#10922#0#PHP" expanded="false" />
-            <element signature="e#10927#12275#0#PHP" expanded="false" />
-            <element signature="e#12281#12983#0#PHP" expanded="false" />
-            <element signature="e#12988#14188#0#PHP" expanded="false" />
-            <element signature="e#14194#14770#0#PHP" expanded="false" />
-            <element signature="e#14775#15336#0#PHP" expanded="false" />
-            <element signature="e#15342#16026#0#PHP" expanded="false" />
-            <element signature="e#16031#18127#0#PHP" expanded="false" />
-            <element signature="e#18133#19003#0#PHP" expanded="false" />
-            <element signature="e#19008#21504#0#PHP" expanded="false" />
-            <element signature="e#21510#21887#0#PHP" expanded="false" />
-            <element signature="e#21892#22213#0#PHP" expanded="false" />
-            <element signature="e#22219#22724#0#PHP" expanded="false" />
-            <element signature="e#22729#22980#0#PHP" expanded="false" />
-            <element signature="e#22986#23465#0#PHP" expanded="false" />
-            <element signature="e#23470#24227#0#PHP" expanded="false" />
-            <element signature="e#24233#24714#0#PHP" expanded="false" />
-            <element signature="e#24719#25489#0#PHP" expanded="false" />
-            <element signature="e#25495#25858#0#PHP" expanded="false" />
-            <element signature="e#25863#26054#0#PHP" expanded="false" />
-            <element signature="e#26060#26418#0#PHP" expanded="false" />
-            <element signature="e#26423#26614#0#PHP" expanded="false" />
-            <element signature="e#26620#27763#0#PHP" expanded="false" />
-            <element signature="e#27768#30433#0#PHP" expanded="false" />
-            <element signature="e#30439#30937#0#PHP" expanded="false" />
-            <element signature="e#30942#32688#0#PHP" expanded="false" />
-            <element signature="e#32694#33107#0#PHP" expanded="false" />
-            <element signature="e#33112#33591#0#PHP" expanded="false" />
-            <element signature="e#33597#34131#0#PHP" expanded="false" />
-            <element signature="e#34136#35521#0#PHP" expanded="false" />
-            <element signature="e#35527#36181#0#PHP" expanded="false" />
-            <element signature="e#36186#38201#0#PHP" expanded="false" />
-            <element signature="e#37224#37686#0#PHP" expanded="false" />
-            <element signature="e#38207#38967#0#PHP" expanded="false" />
-            <element signature="e#38972#41681#0#PHP" expanded="false" />
-            <element signature="e#41707#42538#0#PHP" expanded="false" />
-            <element signature="e#42544#42964#0#PHP" expanded="false" />
-            <element signature="e#42969#43452#0#PHP" expanded="false" />
-            <element signature="e#43458#44264#0#PHP" expanded="false" />
-            <element signature="e#44269#47423#0#PHP" expanded="false" />
-            <element signature="e#47438#48766#0#PHP" expanded="false" />
-            <element signature="e#48782#49809#0#PHP" expanded="false" />
-            <element signature="e#49815#50573#0#PHP" expanded="false" />
-            <element signature="e#50578#54321#0#PHP" expanded="false" />
-            <element signature="e#54327#54719#0#PHP" expanded="false" />
-            <element signature="e#54724#55676#0#PHP" expanded="false" />
-            <element signature="e#55700#56273#0#PHP" expanded="false" />
-            <element signature="e#56279#56878#0#PHP" expanded="false" />
-            <element signature="e#56883#57810#0#PHP" expanded="false" />
-            <element signature="e#57816#58530#0#PHP" expanded="false" />
-            <element signature="e#58536#58963#0#PHP" expanded="false" />
-            <element signature="e#58968#59437#0#PHP" expanded="false" />
+            <element signature="e#699#1012#0#PHP" expanded="false" />
+            <element signature="e#1017#3093#0#PHP" expanded="false" />
+            <element signature="e#3099#3419#0#PHP" expanded="false" />
+            <element signature="e#3424#5506#0#PHP" expanded="false" />
+            <element signature="e#5512#5930#0#PHP" expanded="false" />
+            <element signature="e#5935#13303#0#PHP" expanded="false" />
+            <element signature="e#13309#13729#0#PHP" expanded="false" />
+            <element signature="e#13734#21031#0#PHP" expanded="false" />
+            <element signature="e#21048#21345#0#PHP" expanded="false" />
+            <element signature="e#21350#21743#0#PHP" expanded="false" />
+            <element signature="e#21770#25248#0#PHP" expanded="false" />
+            <element signature="e#25277#28182#0#PHP" expanded="false" />
+            <element signature="e#28211#31661#0#PHP" expanded="false" />
+            <element signature="e#31690#35427#0#PHP" expanded="false" />
+            <element signature="e#35450#35667#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/view/type/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/view/type/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="21" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/view/pictype/add.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
-          <caret line="6" column="26" lean-forward="false" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
+          <caret line="6" column="14" lean-forward="true" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/type.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="20" column="45" lean-forward="true" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
+        <state relative-caret-position="100">
+          <caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
+    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="7" column="4" lean-forward="true" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
+        <state relative-caret-position="75">
+          <caret line="3" column="29" lean-forward="false" selection-start-line="3" selection-start-column="29" selection-end-line="3" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
+    <entry file="file://$PROJECT_DIR$/application/admin/view/pictype/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
+        <state relative-caret-position="525">
+          <caret line="21" column="10" lean-forward="false" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
+    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="409">
-          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
+        <state relative-caret-position="250">
+          <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
+    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/model/relation/OneToOne.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
+        <state relative-caret-position="252">
+          <caret line="185" column="20" lean-forward="false" selection-start-line="185" selection-start-column="20" selection-end-line="185" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/model/Pic.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="20" column="43" lean-forward="false" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/model/Type.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
+        <state relative-caret-position="-27">
+          <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/controller/Type.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
+        <state relative-caret-position="-302">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
+    <entry file="file://$PROJECT_DIR$/application/admin/controller/Pictype.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
+        <state relative-caret-position="548">
+          <caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
+    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
+        <state relative-caret-position="349">
+          <caret line="52" column="39" lean-forward="true" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
+    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pictype.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
+        <state relative-caret-position="375">
+          <caret line="24" column="21" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="24" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
+    <entry file="file://$PROJECT_DIR$/application/admin/model/Pictype.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
+        <state relative-caret-position="413">
+          <caret line="28" column="6" lean-forward="true" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
+    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
+        <state relative-caret-position="475">
+          <caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
+    <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="28" column="63" lean-forward="false" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
+        <state relative-caret-position="475">
+          <caret line="43" column="14" lean-forward="true" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="338">
+          <caret line="134" column="9" lean-forward="true" selection-start-line="134" selection-start-column="9" selection-end-line="134" selection-end-column="9" />
+          <folding>
+            <element signature="e#441#659#0#PHP" expanded="false" />
+            <element signature="e#691#2051#0#PHP" expanded="false" />
+            <element signature="e#2057#2078#0#PHP" expanded="false" />
+            <element signature="e#2083#3957#0#PHP" expanded="false" />
+            <element signature="e#3963#3984#0#PHP" expanded="false" />
+            <element signature="e#6103#6347#0#PHP" expanded="false" />
+            <element signature="e#6353#6601#0#PHP" expanded="false" />
+            <element signature="e#6607#6753#0#PHP" expanded="false" />
+            <element signature="e#6758#12559#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="455">
+          <caret line="39" column="28" lean-forward="true" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="172" column="7" lean-forward="false" selection-start-line="172" selection-start-column="7" selection-end-line="172" selection-end-column="7" />
+          <folding>
+            <element signature="e#2902#3430#0#PHP" expanded="false" />
+            <element signature="e#3435#4571#0#PHP" expanded="false" />
+            <element signature="e#4577#4984#0#PHP" expanded="false" />
+            <element signature="e#4989#5332#0#PHP" expanded="false" />
+            <element signature="e#5338#5751#0#PHP" expanded="false" />
+            <element signature="e#6112#6949#0#PHP" expanded="false" />
+            <element signature="e#6954#9149#0#PHP" expanded="false" />
+            <element signature="e#9155#9800#0#PHP" expanded="false" />
+            <element signature="e#22993#23498#0#PHP" expanded="false" />
+            <element signature="e#23503#23754#0#PHP" expanded="false" />
+            <element signature="e#23760#24239#0#PHP" expanded="false" />
+            <element signature="e#24244#25001#0#PHP" expanded="false" />
+            <element signature="e#25007#25488#0#PHP" expanded="false" />
+            <element signature="e#25493#26263#0#PHP" expanded="false" />
+            <element signature="e#26269#26632#0#PHP" expanded="false" />
+            <element signature="e#26637#26828#0#PHP" expanded="false" />
+            <element signature="e#26834#27192#0#PHP" expanded="false" />
+            <element signature="e#27197#27388#0#PHP" expanded="false" />
+            <element signature="e#27394#28537#0#PHP" expanded="false" />
+            <element signature="e#28542#31207#0#PHP" expanded="false" />
+            <element signature="e#31213#31711#0#PHP" expanded="false" />
+            <element signature="e#31716#33462#0#PHP" expanded="false" />
+            <element signature="e#33468#33881#0#PHP" expanded="false" />
+            <element signature="e#33886#34365#0#PHP" expanded="false" />
+            <element signature="e#34371#34905#0#PHP" expanded="false" />
+            <element signature="e#34910#36295#0#PHP" expanded="false" />
+            <element signature="e#36301#36955#0#PHP" expanded="false" />
+            <element signature="e#36960#38975#0#PHP" expanded="false" />
+            <element signature="e#38981#39741#0#PHP" expanded="false" />
+            <element signature="e#39746#42455#0#PHP" expanded="false" />
+            <element signature="e#42481#43312#0#PHP" expanded="false" />
+            <element signature="e#43318#43738#0#PHP" expanded="false" />
+            <element signature="e#43743#44226#0#PHP" expanded="false" />
+            <element signature="e#44232#45038#0#PHP" expanded="false" />
+            <element signature="e#45043#48197#0#PHP" expanded="false" />
+            <element signature="e#48212#49540#0#PHP" expanded="false" />
+            <element signature="e#49556#50583#0#PHP" expanded="false" />
+            <element signature="e#50589#51347#0#PHP" expanded="false" />
+            <element signature="e#51352#55095#0#PHP" expanded="false" />
+            <element signature="e#55101#55493#0#PHP" expanded="false" />
+            <element signature="e#55498#56450#0#PHP" expanded="false" />
+            <element signature="e#56474#57047#0#PHP" expanded="false" />
+            <element signature="e#57053#57652#0#PHP" expanded="false" />
+            <element signature="e#57657#58584#0#PHP" expanded="false" />
+            <element signature="e#58590#59304#0#PHP" expanded="false" />
+            <element signature="e#59310#59737#0#PHP" expanded="false" />
+            <element signature="e#59742#60211#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/application/admin/controller/Pic.php b/application/admin/controller/Pic.php
index d8f5631..7c6409d 100644
--- a/application/admin/controller/Pic.php
+++ b/application/admin/controller/Pic.php
@@ -58,9 +58,12 @@ class Pic extends Backend
 
             $list = collection($list)->toArray();
             $type = new \app\admin\model\Type();
+            $pictype = new \app\admin\model\Pictype();
             foreach ($list as &$v){
                 $type_ids = $type->whereIn('id',$v['type_ids'])->column('area_name');
+                $pictype_ids = $pictype->whereIn('id',$v['pictype_ids'])->column('typename');
                 $v['type_ids'] = trim(implode(',',$type_ids),',');
+                $v['pictype_ids'] = trim(implode(',',$pictype_ids),',');
             }
             $result = array("total" => $total, "rows" => $list);
 
@@ -79,6 +82,7 @@ class Pic extends Backend
             if ($params) {
                 $params = $this->preExcludeFields($params);
                 $params['type_ids'] =','.$params['type_ids'].',';
+                $params['pictype_ids'] =','.$params['pictype_ids'].',';
                 if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
                     $params[$this->dataLimitField] = $this->auth->id;
                 }
@@ -132,6 +136,7 @@ class Pic extends Backend
         if ($this->request->isPost()) {
             $params = $this->request->post("row/a");
             $params['type_ids'] =','.$params['type_ids'].',';
+            $params['pictype_ids'] =','.$params['pictype_ids'].',';
             if ($params) {
                 $params = $this->preExcludeFields($params);
                 $result = false;
@@ -176,6 +181,15 @@ class Pic extends Backend
         return json($arr);
     }
 
+    public function pictype(){
+        $res = Db::name('pictype')->field('id,typename')->select();
+        $arr = [];
+        foreach($res as $key=>$value){
+            $arr[$value['id']] = $value['typename'];
+        }
+        return json($arr);
+    }
+
     /**
      * 生成查询所需要的条件,排序方式
      * @param mixed   $searchfields   快速查询的字段
diff --git a/application/admin/controller/Pictype.php b/application/admin/controller/Pictype.php
new file mode 100644
index 0000000..8adfc59
--- /dev/null
+++ b/application/admin/controller/Pictype.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 图片类型管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Pictype extends Backend
+{
+    
+    /**
+     * Pictype模型对象
+     * @var \app\admin\model\Pictype
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Pictype;
+
+    }
+    
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    
+
+}
diff --git a/application/admin/lang/zh-cn/pic.php b/application/admin/lang/zh-cn/pic.php
index bd33f18..c462f9b 100644
--- a/application/admin/lang/zh-cn/pic.php
+++ b/application/admin/lang/zh-cn/pic.php
@@ -8,6 +8,7 @@ return [
     'Keyword'      => '关键词(多个关键词中间用逗号隔开)',
     'Thumbnail'    => '缩略图',
     'Type_ids'     => '地区标签',
+    'Pictype_ids'     => '图片类型',
     'Water_url'    => '带水印的小样图片',
     'Url'          => '高清百度云盘地址',
     'Code'         =>'提取码',
diff --git a/application/admin/lang/zh-cn/pictype.php b/application/admin/lang/zh-cn/pictype.php
new file mode 100644
index 0000000..d9efeca
--- /dev/null
+++ b/application/admin/lang/zh-cn/pictype.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'Id'         => '图片类型ID',
+    'Typename'   => '分类名称',
+    'Thumbnail'  => '缩略图',
+    'Createtime' => '创建时间',
+    'Updatetime' => '修改时间'
+];
diff --git a/application/admin/model/Pictype.php b/application/admin/model/Pictype.php
new file mode 100644
index 0000000..a8a6ed5
--- /dev/null
+++ b/application/admin/model/Pictype.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Pictype extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'pictype';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+
+    public function pic()
+    {
+        return $this->belongsTo('Pic', 'pictype_id')->setEagerlyType(0);
+    }
+
+
+
+}
diff --git a/application/admin/validate/Pictype.php b/application/admin/validate/Pictype.php
new file mode 100644
index 0000000..65fc82d
--- /dev/null
+++ b/application/admin/validate/Pictype.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Pictype extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}
diff --git a/application/admin/view/pic/add.html b/application/admin/view/pic/add.html
index b0c2a4c..ea674d8 100644
--- a/application/admin/view/pic/add.html
+++ b/application/admin/view/pic/add.html
@@ -44,6 +44,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pictype_ids" data-rule="required" data-source="pictype/index" data-multiple="true" data-field="typename" class="form-control selectpage" name="row[pictype_ids]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
diff --git a/application/admin/view/pic/edit.html b/application/admin/view/pic/edit.html
index 50ae990..6384f8e 100644
--- a/application/admin/view/pic/edit.html
+++ b/application/admin/view/pic/edit.html
@@ -44,6 +44,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pictype_ids')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pictype_ids" data-rule="required" data-source="pictype/index" data-multiple="true" data-field="typename" class="form-control selectpage" name="row[pictype_ids]" type="text" value="{$row.pictype_ids}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Water_url')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
diff --git a/application/admin/view/pictype/add.html b/application/admin/view/pictype/add.html
new file mode 100644
index 0000000..6b680c2
--- /dev/null
+++ b/application/admin/view/pictype/add.html
@@ -0,0 +1,30 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Typename')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-typename" class="form-control" name="row[typename]" type="text">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-thumbnail" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" placeholder="请输入缩略图">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="plupload-thumbnail" class="btn btn-danger plupload" data-input-id="c-thumbnail" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-thumbnail"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-thumbnail" class="btn btn-primary fachoose" data-input-id="c-thumbnail" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right"></span>
+            </div>
+            <ul class="row list-inline plupload-preview" id="p-thumbnail"></ul>
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>
diff --git a/application/admin/view/pictype/edit.html b/application/admin/view/pictype/edit.html
new file mode 100644
index 0000000..f0f5ea7
--- /dev/null
+++ b/application/admin/view/pictype/edit.html
@@ -0,0 +1,30 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Typename')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-typename" class="form-control" name="row[typename]" type="text" value="{$row.typename|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传缩略图">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right"></span>
+            </div>
+            <ul class="row list-inline plupload-preview" id="p-image"></ul>
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>
diff --git a/application/admin/view/pictype/index.html b/application/admin/view/pictype/index.html
new file mode 100644
index 0000000..de636ba
--- /dev/null
+++ b/application/admin/view/pictype/index.html
@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('pictype/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('pictype/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('pictype/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('pictype/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+
+                        <div class="dropdown btn-group {:$auth->check('pictype/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('pictype/edit')}" 
+                           data-operate-del="{:$auth->check('pictype/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/application/admin/view/type/edit.html b/application/admin/view/type/edit.html
index 322ad42..4476161 100644
--- a/application/admin/view/type/edit.html
+++ b/application/admin/view/type/edit.html
@@ -7,7 +7,7 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
                 <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传缩略图">
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 2748c43..1f89b33 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -171,6 +171,39 @@ class User extends Api
     }
 
     /**
+     * @ApiTitle    (图片分类(类型))
+     * @ApiSummary  (图片分类(类型))
+     * @ApiMethod   (POST)
+     * @ApiRoute    (/api/user/pictype)
+     * @ApiHeaders  (name=token, type=string, required=true, description="请求的Token")
+     *
+     * @ApiReturn({
+    "code": 1,
+    "msg": "成功",
+    "time": "1571492001",
+    "data": {
+        "id": 4,//分类id
+        "typename": //分类名称
+        "thumbnail": //图片
+    }
+    })
+     */
+    public function pictype()
+    {
+        $rule = config('verify.path');
+        $data = Db::name('pictype')
+            ->field('id,typename,thumbnail')
+            ->order('id desc')
+            ->select();
+        foreach ($data as &$v){
+            $v['thumbnail'] = $rule.$v['thumbnail'];
+        }
+        $this->success('SUCCESS',$data);
+    }
+
+
+
+    /**
      * @ApiTitle    (搜索页)
      * @ApiSummary  (搜索页)
      * @ApiMethod   (POST)
diff --git a/public/api.html b/public/api.html
index 1475d8b..f299bef 100644
--- a/public/api.html
+++ b/public/api.html
@@ -170,37 +170,38 @@
                                         <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="16" class="list-group-item">小程序登录</a>
-                                                <a href="javascript:;" data-id="33" class="list-group-item">加入购物车</a>
-                                                <a href="javascript:;" data-id="46" class="list-group-item">获取用户手机号</a>
-                                                <a href="javascript:;" data-id="45" class="list-group-item"></a>
-                                                <a href="javascript:;" data-id="44" class="list-group-item">获取sessionkey</a>
-                                                <a href="javascript:;" data-id="43" class="list-group-item">消费记录</a>
+                                                <a href="javascript:;" data-id="33" class="list-group-item">购物车列表</a>
+                                                <a href="javascript:;" data-id="47" class="list-group-item">获取用户手机号</a>
+                                                <a href="javascript:;" data-id="46" class="list-group-item"></a>
+                                                <a href="javascript:;" data-id="45" class="list-group-item">获取sessionkey</a>
+                                                <a href="javascript:;" data-id="44" class="list-group-item">消费记录</a>
+                                                <a href="javascript:;" data-id="43" class="list-group-item"></a>
                                                 <a href="javascript:;" data-id="42" class="list-group-item"></a>
-                                                <a href="javascript:;" data-id="41" class="list-group-item"></a>
-                                                <a href="javascript:;" data-id="40" class="list-group-item">我的订单</a>
-                                                <a href="javascript:;" data-id="39" class="list-group-item">删除订单</a>
-                                                <a href="javascript:;" data-id="38" class="list-group-item"></a>
-                                                <a href="javascript:;" data-id="37" class="list-group-item">创建组合订单</a>
-                                                <a href="javascript:;" data-id="36" class="list-group-item">创建视频订单</a>
-                                                <a href="javascript:;" data-id="35" class="list-group-item">创建图片订单</a>
-                                                <a href="javascript:;" data-id="34" class="list-group-item">删除购物车商品</a>
-                                                <a href="javascript:;" data-id="32" class="list-group-item">购物车列表</a>
+                                                <a href="javascript:;" data-id="41" class="list-group-item">我的订单</a>
+                                                <a href="javascript:;" data-id="40" class="list-group-item">删除订单</a>
+                                                <a href="javascript:;" data-id="39" class="list-group-item"></a>
+                                                <a href="javascript:;" data-id="38" class="list-group-item">创建组合订单</a>
+                                                <a href="javascript:;" data-id="37" class="list-group-item">创建视频订单</a>
+                                                <a href="javascript:;" data-id="36" class="list-group-item">创建图片订单</a>
+                                                <a href="javascript:;" data-id="35" class="list-group-item">删除购物车商品</a>
+                                                <a href="javascript:;" data-id="34" class="list-group-item">加入购物车</a>
+                                                <a href="javascript:;" data-id="32" class="list-group-item">会员须知</a>
                                                 <a href="javascript:;" data-id="17" class="list-group-item">首页视频、图片、精美大片入口</a>
-                                                <a href="javascript:;" data-id="31" class="list-group-item">会员须知</a>
-                                                <a href="javascript:;" data-id="30" class="list-group-item">会员介绍</a>
-                                                <a href="javascript:;" data-id="29" class="list-group-item">创建开通会员订单</a>
-                                                <a href="javascript:;" data-id="28" class="list-group-item">创建充值订单</a>
-                                                <a href="javascript:;" data-id="27" class="list-group-item">我的</a>
-                                                <a href="javascript:;" data-id="26" class="list-group-item">历史记录</a>
-                                                <a href="javascript:;" data-id="25" class="list-group-item">视频详情</a>
-                                                <a href="javascript:;" data-id="24" class="list-group-item">图片详情</a>
-                                                <a href="javascript:;" data-id="23" class="list-group-item">精美大片列表</a>
-                                                <a href="javascript:;" data-id="22" class="list-group-item">视频列表</a>
-                                                <a href="javascript:;" data-id="21" class="list-group-item">分类下的图片视频</a>
-                                                <a href="javascript:;" data-id="20" class="list-group-item">图片列表</a>
-                                                <a href="javascript:;" data-id="19" class="list-group-item">搜索页</a>
+                                                <a href="javascript:;" data-id="31" class="list-group-item">会员介绍</a>
+                                                <a href="javascript:;" data-id="30" class="list-group-item">创建开通会员订单</a>
+                                                <a href="javascript:;" data-id="29" class="list-group-item">创建充值订单</a>
+                                                <a href="javascript:;" data-id="28" class="list-group-item">我的</a>
+                                                <a href="javascript:;" data-id="27" class="list-group-item">历史记录</a>
+                                                <a href="javascript:;" data-id="26" class="list-group-item">视频详情</a>
+                                                <a href="javascript:;" data-id="25" class="list-group-item">图片详情</a>
+                                                <a href="javascript:;" data-id="24" class="list-group-item">精美大片列表</a>
+                                                <a href="javascript:;" data-id="23" class="list-group-item">视频列表</a>
+                                                <a href="javascript:;" data-id="22" class="list-group-item">分类下的图片视频</a>
+                                                <a href="javascript:;" data-id="21" class="list-group-item">图片列表</a>
+                                                <a href="javascript:;" data-id="20" class="list-group-item">搜索页</a>
+                                                <a href="javascript:;" data-id="19" class="list-group-item">图片分类(类型</a>
                                                 <a href="javascript:;" data-id="18" class="list-group-item">地区分类</a>
-                                                <a href="javascript:;" data-id="47" class="list-group-item">绑定用户手机号</a>
+                                                <a href="javascript:;" data-id="48" class="list-group-item">绑定用户手机号</a>
                                             </div>
                                     </div>
             </div>
@@ -2092,7 +2093,7 @@
                     <div class="panel-heading" id="heading-33">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion33" href="#collapseOne33"> 加入购物车 <span class="text-muted">/api/user/addcar</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion33" href="#collapseOne33"> 购物车列表 <span class="text-muted">/api/user/car</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne33" class="panel-collapse collapse">
@@ -2110,7 +2111,7 @@
 
                                 <div class="tab-pane active" id="info33">
                                     <div class="well">
-                                        加入购物车                                    </div>
+                                        购物车列表                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -2137,30 +2138,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>pic_id</td>
-                                                        <td>inter</td>
-                                                        <td>否</td>
-                                                        <td>图片ID</td>
-                                                    </tr>
-                                                                                                        <tr>
-                                                        <td>video_id</td>
-                                                        <td>inter</td>
-                                                        <td>否</td>
-                                                        <td>视频ID</td>
-                                                    </tr>
-                                                                                                    </tbody>
-                                            </table>
+                                                                                        无
                                                                                     </div>
                                     </div>
                                     <div class="panel panel-default">
@@ -2187,14 +2165,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/user/addcar" method="POST" name="form33" id="form33">
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="pic_id">pic_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="pic_id"  placeholder="图片ID" name="pic_id">
-                                                        </div>
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/car" method="POST" name="form33" id="form33">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="video_id">video_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="video_id"  placeholder="视频ID" name="video_id">
+                                                            无
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="33">提交</button>
@@ -2231,6 +2204,35 @@
     "code": 1,
     "msg": "成功",
     "time": "1571492001",
+    "data": {
+        "id"://购物车ID
+          "user_id"://用户ID
+          "pic_id"://图片的ID
+          "video_id"://视频的ID
+          "pic":[
+                "id"://图片ID
+               "title"://图片标题
+               "thumbnail"://缩略图
+               "url"://高清百度云盘地址
+               "price"://普通价格
+               "vip_price"://vip价格
+          ],
+          "video":[
+               "id"://视频ID
+               "title"://视频标题
+               "thumbnail"://视频封面图片
+               "video"://视频地址
+               "two_url"://2K视频云盘地址
+               "four_url"://4k视频云盘地址
+               "eight_url"://8k视频云盘地址
+               "price"://2k视频原价格
+               "four_price"://4k视频原价格
+               "eight_price"://8k视频原价格
+               "vip_price"://2k会员价格
+               "four_vipprice"://4k会员价格
+               "eight_vipprice"://8k会员价格
+          ]
+    }
     }</pre>
                                         </div>
                                     </div>
@@ -2241,26 +2243,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-46">
+                    <div class="panel-heading" id="heading-47">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion46" href="#collapseOne46"> 获取用户手机号 <span class="text-muted">/api/user/getMobile</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion47" href="#collapseOne47"> 获取用户手机号 <span class="text-muted">/api/user/getMobile</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne46" class="panel-collapse collapse">
+                    <div id="collapseOne47" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab46">
-                                <li class="active"><a href="#info46" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox46" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample46" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab47">
+                                <li class="active"><a href="#info47" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox47" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample47" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info46">
+                                <div class="tab-pane active" id="info47">
                                     <div class="well">
                                         获取用户手机号                                    </div>
                                     <div class="panel panel-default">
@@ -2311,13 +2313,13 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox46">
+                                <div class="tab-pane" id="sandbox47">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <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/user/getMobile" method="POST" name="form46" id="form46">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/getMobile" method="POST" name="form47" id="form47">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="sessionKey">sessionKey</label>
                                                             <input type="string" class="form-control input-sm" id="sessionKey" required placeholder="sessionkey" name="sessionKey">
@@ -2331,8 +2333,8 @@
                                                             <input type="string" class="form-control input-sm" id="iv" required placeholder="iv" name="iv">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="46">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="46">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="47">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="47">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -2342,8 +2344,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers46"></pre>
-                                                            <pre id="response46"></pre>
+                                                            <pre id="response_headers47"></pre>
+                                                            <pre id="response47"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -2358,10 +2360,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample46">
+                                <div class="tab-pane" id="sample47">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response46">{
+                                            <pre id="sample_response47">{
         "code": 1,
         "msg": "成功",
         "time": "1571492001",
@@ -2378,26 +2380,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-45">
+                    <div class="panel-heading" id="heading-46">
                         <h4 class="panel-title">
                             <span class="label label-success">GET</span>
-                            <a data-toggle="collapse" data-parent="#accordion45" href="#collapseOne45">  <span class="text-muted">/api/user/http_get</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion46" href="#collapseOne46">  <span class="text-muted">/api/user/http_get</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne45" class="panel-collapse collapse">
+                    <div id="collapseOne46" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab45">
-                                <li class="active"><a href="#info45" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox45" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample45" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab46">
+                                <li class="active"><a href="#info46" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox46" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample46" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info45">
+                                <div class="tab-pane active" id="info46">
                                     <div class="well">
                                                                             </div>
                                     <div class="panel panel-default">
@@ -2419,19 +2421,19 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox45">
+                                <div class="tab-pane" id="sandbox46">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <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/user/http_get" method="get" name="form45" id="form45">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/http_get" method="get" name="form46" id="form46">
                                                                                                                 <div class="form-group">
                                                             无
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="45">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="45">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="46">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="46">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -2441,8 +2443,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers45"></pre>
-                                                            <pre id="response45"></pre>
+                                                            <pre id="response_headers46"></pre>
+                                                            <pre id="response46"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -2457,10 +2459,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample45">
+                                <div class="tab-pane" id="sample46">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response45">无</pre>
+                                            <pre id="sample_response46">无</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -2470,26 +2472,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-44">
+                    <div class="panel-heading" id="heading-45">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion44" href="#collapseOne44"> 获取sessionkey <span class="text-muted">/api/user/getSessionKey</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion45" href="#collapseOne45"> 获取sessionkey <span class="text-muted">/api/user/getSessionKey</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne44" class="panel-collapse collapse">
+                    <div id="collapseOne45" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab44">
-                                <li class="active"><a href="#info44" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox44" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample44" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab45">
+                                <li class="active"><a href="#info45" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox45" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample45" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info44">
+                                <div class="tab-pane active" id="info45">
                                     <div class="well">
                                         获取sessionkey                                    </div>
                                     <div class="panel panel-default">
@@ -2528,20 +2530,20 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox44">
+                                <div class="tab-pane" id="sandbox45">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <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/user/getSessionKey" method="POST" name="form44" id="form44">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/getSessionKey" method="POST" name="form45" id="form45">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="code">code</label>
                                                             <input type="string" class="form-control input-sm" id="code" required placeholder="code" name="code">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="44">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="44">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="45">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="45">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -2551,8 +2553,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers44"></pre>
-                                                            <pre id="response44"></pre>
+                                                            <pre id="response_headers45"></pre>
+                                                            <pre id="response45"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -2567,10 +2569,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample44">
+                                <div class="tab-pane" id="sample45">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response44">{
+                                            <pre id="sample_response45">{
     "code": 1,
     "msg": "成功",
     "time": "1571492001",
@@ -2587,26 +2589,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-43">
+                    <div class="panel-heading" id="heading-44">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion43" href="#collapseOne43"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion44" href="#collapseOne44"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne43" class="panel-collapse collapse">
+                    <div id="collapseOne44" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab43">
-                                <li class="active"><a href="#info43" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox43" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample43" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab44">
+                                <li class="active"><a href="#info44" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox44" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample44" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info43">
+                                <div class="tab-pane active" id="info44">
                                     <div class="well">
                                         消费记录                                    </div>
                                     <div class="panel panel-default">
@@ -2668,7 +2670,7 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox43">
+                                <div class="tab-pane" id="sandbox44">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <div class="panel panel-default">
@@ -2685,7 +2687,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/user/payhistory" method="POST" name="form43" id="form43">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/payhistory" method="POST" name="form44" id="form44">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="page">page</label>
                                                             <input type="inter" class="form-control input-sm" id="page"  placeholder="当前页(默认1" name="page">
@@ -2695,8 +2697,8 @@
                                                             <input type="inter" class="form-control input-sm" id="pageNum"  placeholder="每页显示数据个数(默认10)" name="pageNum">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="43">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="43">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="44">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="44">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -2706,8 +2708,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers43"></pre>
-                                                            <pre id="response43"></pre>
+                                                            <pre id="response_headers44"></pre>
+                                                            <pre id="response44"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -2722,10 +2724,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample43">
+                                <div class="tab-pane" id="sample44">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response43">{
+                                            <pre id="sample_response44">{
         "code": 1,
         "msg": "成功",
         "time": "1571492001",
@@ -2749,26 +2751,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-42">
+                    <div class="panel-heading" id="heading-43">
                         <h4 class="panel-title">
                             <span class="label label-success">GET</span>
-                            <a data-toggle="collapse" data-parent="#accordion42" href="#collapseOne42">  <span class="text-muted">/api/user/fetch1</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion43" href="#collapseOne43">  <span class="text-muted">/api/user/fetch1</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne42" class="panel-collapse collapse">
+                    <div id="collapseOne43" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab42">
-                                <li class="active"><a href="#info42" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox42" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample42" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab43">
+                                <li class="active"><a href="#info43" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox43" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample43" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info42">
+                                <div class="tab-pane active" id="info43">
                                     <div class="well">
                                                                             </div>
                                     <div class="panel panel-default">
@@ -2790,19 +2792,19 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox42">
+                                <div class="tab-pane" id="sandbox43">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <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/user/fetch1" method="get" name="form42" id="form42">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/fetch1" method="get" name="form43" id="form43">
                                                                                                                 <div class="form-group">
                                                             无
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="42">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="42">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="43">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="43">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -2812,8 +2814,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers42"></pre>
-                                                            <pre id="response42"></pre>
+                                                            <pre id="response_headers43"></pre>
+                                                            <pre id="response43"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -2828,10 +2830,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample42">
+                                <div class="tab-pane" id="sample43">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response42">无</pre>
+                                            <pre id="sample_response43">无</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -2841,26 +2843,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-41">
+                    <div class="panel-heading" id="heading-42">
                         <h4 class="panel-title">
                             <span class="label label-success">GET</span>
-                            <a data-toggle="collapse" data-parent="#accordion41" href="#collapseOne41">  <span class="text-muted">/api/user/fetch</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion42" href="#collapseOne42">  <span class="text-muted">/api/user/fetch</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne41" class="panel-collapse collapse">
+                    <div id="collapseOne42" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab41">
-                                <li class="active"><a href="#info41" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox41" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample41" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab42">
+                                <li class="active"><a href="#info42" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox42" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample42" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info41">
+                                <div class="tab-pane active" id="info42">
                                     <div class="well">
                                                                             </div>
                                     <div class="panel panel-default">
@@ -2882,19 +2884,19 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox41">
+                                <div class="tab-pane" id="sandbox42">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <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/user/fetch" method="get" name="form41" id="form41">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/fetch" method="get" name="form42" id="form42">
                                                                                                                 <div class="form-group">
                                                             无
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="41">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="41">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="42">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="42">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -2904,8 +2906,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers41"></pre>
-                                                            <pre id="response41"></pre>
+                                                            <pre id="response_headers42"></pre>
+                                                            <pre id="response42"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -2920,10 +2922,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample41">
+                                <div class="tab-pane" id="sample42">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response41">无</pre>
+                                            <pre id="sample_response42">无</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -2933,26 +2935,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-40">
+                    <div class="panel-heading" id="heading-41">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion40" href="#collapseOne40"> 我的订单 <span class="text-muted">/api/user/myorder</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion41" href="#collapseOne41"> 我的订单 <span class="text-muted">/api/user/myorder</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne40" class="panel-collapse collapse">
+                    <div id="collapseOne41" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab40">
-                                <li class="active"><a href="#info40" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox40" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample40" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab41">
+                                <li class="active"><a href="#info41" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox41" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample41" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info40">
+                                <div class="tab-pane active" id="info41">
                                     <div class="well">
                                         我的订单                                    </div>
                                     <div class="panel panel-default">
@@ -3020,7 +3022,7 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox40">
+                                <div class="tab-pane" id="sandbox41">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <div class="panel panel-default">
@@ -3037,7 +3039,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/user/myorder" method="POST" name="form40" id="form40">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/myorder" method="POST" name="form41" id="form41">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="type">type</label>
                                                             <input type="inter" class="form-control input-sm" id="type"  placeholder="状态(不传默认为全部 1为待支付 2为已完成" name="type">
@@ -3051,8 +3053,8 @@
                                                             <input type="inter" class="form-control input-sm" id="pageNum"  placeholder="每页显示数据个数(默认10)" name="pageNum">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="40">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="40">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="41">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="41">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -3062,8 +3064,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers40"></pre>
-                                                            <pre id="response40"></pre>
+                                                            <pre id="response_headers41"></pre>
+                                                            <pre id="response41"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -3078,10 +3080,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample40">
+                                <div class="tab-pane" id="sample41">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response40">{
+                                            <pre id="sample_response41">{
         "code": 1,
         "msg": "成功",
         "time": "1571492001",
@@ -3099,26 +3101,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-39">
+                    <div class="panel-heading" id="heading-40">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 删除订单 <span class="text-muted">/api/user/delorder</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion40" href="#collapseOne40"> 删除订单 <span class="text-muted">/api/user/delorder</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne39" class="panel-collapse collapse">
+                    <div id="collapseOne40" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab39">
-                                <li class="active"><a href="#info39" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox39" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample39" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab40">
+                                <li class="active"><a href="#info40" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox40" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample40" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info39">
+                                <div class="tab-pane active" id="info40">
                                     <div class="well">
                                         删除订单                                    </div>
                                     <div class="panel panel-default">
@@ -3174,7 +3176,7 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox39">
+                                <div class="tab-pane" id="sandbox40">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <div class="panel panel-default">
@@ -3191,14 +3193,14 @@
                                                                                         <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/user/delorder" method="POST" name="form39" id="form39">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/delorder" method="POST" name="form40" id="form40">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="ids[]">ids[]</label>
                                                             <input type="inter" class="form-control input-sm" id="ids[]" required placeholder="订单ID" name="ids[]">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="39">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="39">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="40">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="40">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -3208,8 +3210,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers39"></pre>
-                                                            <pre id="response39"></pre>
+                                                            <pre id="response_headers40"></pre>
+                                                            <pre id="response40"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -3224,10 +3226,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample39">
+                                <div class="tab-pane" id="sample40">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response39">{
+                                            <pre id="sample_response40">{
         "code": 1,
         "msg": "成功",
         "time": "1571492001",
@@ -3241,26 +3243,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-38">
+                    <div class="panel-heading" id="heading-39">
                         <h4 class="panel-title">
                             <span class="label label-success">GET</span>
-                            <a data-toggle="collapse" data-parent="#accordion38" href="#collapseOne38">  <span class="text-muted">/api/user/array_merge_more</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39">  <span class="text-muted">/api/user/array_merge_more</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne38" class="panel-collapse collapse">
+                    <div id="collapseOne39" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab38">
-                                <li class="active"><a href="#info38" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox38" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample38" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab39">
+                                <li class="active"><a href="#info39" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox39" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample39" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info38">
+                                <div class="tab-pane active" id="info39">
                                     <div class="well">
                                                                             </div>
                                     <div class="panel panel-default">
@@ -3282,19 +3284,19 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox38">
+                                <div class="tab-pane" id="sandbox39">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <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/user/array_merge_more" method="get" name="form38" id="form38">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/array_merge_more" method="get" name="form39" id="form39">
                                                                                                                 <div class="form-group">
                                                             无
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="38">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="38">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="39">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="39">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -3304,8 +3306,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers38"></pre>
-                                                            <pre id="response38"></pre>
+                                                            <pre id="response_headers39"></pre>
+                                                            <pre id="response39"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -3320,10 +3322,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample38">
+                                <div class="tab-pane" id="sample39">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response38">无</pre>
+                                            <pre id="sample_response39">无</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -3333,26 +3335,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-37">
+                    <div class="panel-heading" id="heading-38">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> 创建组合订单 <span class="text-muted">/api/user/orders</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion38" href="#collapseOne38"> 创建组合订单 <span class="text-muted">/api/user/orders</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne37" class="panel-collapse collapse">
+                    <div id="collapseOne38" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab37">
-                                <li class="active"><a href="#info37" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox37" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample37" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab38">
+                                <li class="active"><a href="#info38" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox38" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample38" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info37">
+                                <div class="tab-pane active" id="info38">
                                     <div class="well">
                                         创建组合订单                                    </div>
                                     <div class="panel panel-default">
@@ -3426,7 +3428,7 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox37">
+                                <div class="tab-pane" id="sandbox38">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <div class="panel panel-default">
@@ -3443,7 +3445,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/user/orders" method="POST" name="form37" id="form37">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/orders" method="POST" name="form38" id="form38">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="video_id">video_id</label>
                                                             <input type="string" class="form-control input-sm" id="video_id" required placeholder="视频ID(多个以逗号隔开" name="video_id">
@@ -3461,8 +3463,8 @@
                                                             <input type="float" class="form-control input-sm" id="total" required placeholder="总价格" name="total">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="37">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="37">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="38">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="38">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -3472,8 +3474,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers37"></pre>
-                                                            <pre id="response37"></pre>
+                                                            <pre id="response_headers38"></pre>
+                                                            <pre id="response38"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -3488,10 +3490,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample37">
+                                <div class="tab-pane" id="sample38">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response37">{
+                                            <pre id="sample_response38">{
         "code": 1,
         "msg": "成功",
         "time": "1571492001",
@@ -3508,26 +3510,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-36">
+                    <div class="panel-heading" id="heading-37">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 创建视频订单 <span class="text-muted">/api/user/v_order</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> 创建视频订单 <span class="text-muted">/api/user/v_order</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne36" class="panel-collapse collapse">
+                    <div id="collapseOne37" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab36">
-                                <li class="active"><a href="#info36" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox36" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample36" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab37">
+                                <li class="active"><a href="#info37" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox37" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample37" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info36">
+                                <div class="tab-pane active" id="info37">
                                     <div class="well">
                                         创建视频订单                                    </div>
                                     <div class="panel panel-default">
@@ -3595,7 +3597,7 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox36">
+                                <div class="tab-pane" id="sandbox37">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <div class="panel panel-default">
@@ -3612,7 +3614,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/user/v_order" method="POST" name="form36" id="form36">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/v_order" method="POST" name="form37" id="form37">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="video_id">video_id</label>
                                                             <input type="inter" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
@@ -3626,8 +3628,8 @@
                                                             <input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="36">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="36">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="37">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="37">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -3637,8 +3639,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers36"></pre>
-                                                            <pre id="response36"></pre>
+                                                            <pre id="response_headers37"></pre>
+                                                            <pre id="response37"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -3653,10 +3655,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample36">
+                                <div class="tab-pane" id="sample37">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response36">{
+                                            <pre id="sample_response37">{
         "code": 1,
         "msg": "成功",
         "time": "1571492001",
@@ -3673,10 +3675,165 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
+                    <div class="panel-heading" id="heading-36">
+                        <h4 class="panel-title">
+                            <span class="label label-primary">POST</span>
+                            <a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 创建图片订单 <span class="text-muted">/api/user/picorder</span></a>
+                        </h4>
+                    </div>
+                    <div id="collapseOne36" class="panel-collapse collapse">
+                        <div class="panel-body">
+
+                            <!-- Nav tabs -->
+                            <ul class="nav nav-tabs" id="doctab36">
+                                <li class="active"><a href="#info36" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox36" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample36" data-toggle="tab">返回示例</a></li>
+                            </ul>
+
+                            <!-- Tab panes -->
+                            <div class="tab-content">
+
+                                <div class="tab-pane active" id="info36">
+                                    <div class="well">
+                                        创建图片订单                                    </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>pic_id</td>
+                                                        <td>inter</td>
+                                                        <td>是</td>
+                                                        <td>图片ID</td>
+                                                    </tr>
+                                                                                                        <tr>
+                                                        <td>total</td>
+                                                        <td>float</td>
+                                                        <td>是</td>
+                                                        <td>价格</td>
+                                                    </tr>
+                                                                                                    </tbody>
+                                            </table>
+                                                                                    </div>
+                                    </div>
+                                    <div class="panel panel-default">
+                                        <div class="panel-heading"><strong>正文</strong></div>
+                                        <div class="panel-body">
+                                            无                                        </div>
+                                    </div>
+                                </div><!-- #info -->
+
+                                <div class="tab-pane" id="sandbox36">
+                                    <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/user/picorder" method="POST" name="form36" id="form36">
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="pic_id">pic_id</label>
+                                                            <input type="inter" class="form-control input-sm" id="pic_id" required placeholder="图片ID" name="pic_id">
+                                                        </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="total">total</label>
+                                                            <input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total">
+                                                        </div>
+                                                                                                                <div class="form-group">
+                                                            <button type="submit" class="btn btn-success send" rel="36">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="36">重置</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
+                                            <div class="panel panel-default">
+                                                <div class="panel-heading"><strong>响应输出</strong></div>
+                                                <div class="panel-body">
+                                                    <div class="row">
+                                                        <div class="col-md-12" style="overflow-x:auto">
+                                                            <pre id="response_headers36"></pre>
+                                                            <pre id="response36"></pre>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="panel panel-default">
+                                                <div class="panel-heading"><strong>返回参数</strong></div>
+                                                <div class="panel-body">
+                                                                                                        无
+                                                                                                    </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div><!-- #sandbox -->
+
+                                <div class="tab-pane" id="sample36">
+                                    <div class="row">
+                                        <div class="col-md-12">
+                                            <pre id="sample_response36">{
+    "code": 1,
+    "msg": "成功",
+    "time": "1571492001",
+    "data": {
+        "order_id"://订单ID
+    }
+    }</pre>
+                                        </div>
+                                    </div>
+                                </div><!-- #sample -->
+
+                            </div><!-- .tab-content -->
+                        </div>
+                    </div>
+                </div>
+                                <div class="panel panel-default">
                     <div class="panel-heading" id="heading-35">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion35" href="#collapseOne35"> 创建图片订单 <span class="text-muted">/api/user/picorder</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion35" href="#collapseOne35"> 删除购物车商品 <span class="text-muted">/api/user/delcar</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne35" class="panel-collapse collapse">
@@ -3694,7 +3851,7 @@
 
                                 <div class="tab-pane active" id="info35">
                                     <div class="well">
-                                        创建图片订单                                    </div>
+                                        删除购物车商品                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -3732,16 +3889,10 @@
                                                 </thead>
                                                 <tbody>
                                                                                                         <tr>
-                                                        <td>pic_id</td>
+                                                        <td>ids[]</td>
                                                         <td>inter</td>
                                                         <td>是</td>
-                                                        <td>图片ID</td>
-                                                    </tr>
-                                                                                                        <tr>
-                                                        <td>total</td>
-                                                        <td>float</td>
-                                                        <td>是</td>
-                                                        <td>价格</td>
+                                                        <td>购物车ID</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -3771,14 +3922,10 @@
                                                                                         <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/user/picorder" method="POST" name="form35" id="form35">
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="pic_id">pic_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="pic_id" required placeholder="图片ID" name="pic_id">
-                                                        </div>
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/delcar" method="POST" name="form35" id="form35">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="total">total</label>
-                                                            <input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total">
+                                                            <label class="control-label" for="ids[]">ids[]</label>
+                                                            <input type="inter" class="form-control input-sm" id="ids[]" required placeholder="购物车ID" name="ids[]">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="35">提交</button>
@@ -3815,9 +3962,6 @@
     "code": 1,
     "msg": "成功",
     "time": "1571492001",
-    "data": {
-        "order_id"://订单ID
-    }
     }</pre>
                                         </div>
                                     </div>
@@ -3831,7 +3975,7 @@
                     <div class="panel-heading" id="heading-34">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion34" href="#collapseOne34"> 删除购物车商品 <span class="text-muted">/api/user/delcar</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion34" href="#collapseOne34"> 加入购物车 <span class="text-muted">/api/user/addcar</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne34" class="panel-collapse collapse">
@@ -3849,7 +3993,7 @@
 
                                 <div class="tab-pane active" id="info34">
                                     <div class="well">
-                                        删除购物车商品                                    </div>
+                                        加入购物车                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -3887,10 +4031,16 @@
                                                 </thead>
                                                 <tbody>
                                                                                                         <tr>
-                                                        <td>ids[]</td>
+                                                        <td>pic_id</td>
                                                         <td>inter</td>
-                                                        <td>是</td>
-                                                        <td>购物车ID</td>
+                                                        <td>否</td>
+                                                        <td>图片ID</td>
+                                                    </tr>
+                                                                                                        <tr>
+                                                        <td>video_id</td>
+                                                        <td>inter</td>
+                                                        <td>否</td>
+                                                        <td>视频ID</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -3920,10 +4070,14 @@
                                                                                         <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/user/delcar" method="POST" name="form34" id="form34">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/addcar" method="POST" name="form34" id="form34">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="ids[]">ids[]</label>
-                                                            <input type="inter" class="form-control input-sm" id="ids[]" required placeholder="购物车ID" name="ids[]">
+                                                            <label class="control-label" for="pic_id">pic_id</label>
+                                                            <input type="inter" class="form-control input-sm" id="pic_id"  placeholder="图片ID" name="pic_id">
+                                                        </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="video_id">video_id</label>
+                                                            <input type="inter" class="form-control input-sm" id="video_id"  placeholder="视频ID" name="video_id">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="34">提交</button>
@@ -3973,7 +4127,7 @@
                     <div class="panel-heading" id="heading-32">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion32" href="#collapseOne32"> 购物车列表 <span class="text-muted">/api/user/car</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion32" href="#collapseOne32"> 会员须知 <span class="text-muted">/api/user/vipdetail</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne32" class="panel-collapse collapse">
@@ -3991,7 +4145,7 @@
 
                                 <div class="tab-pane active" id="info32">
                                     <div class="well">
-                                        购物车列表                                    </div>
+                                        会员须知                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -4045,7 +4199,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/user/car" method="POST" name="form32" id="form32">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/vipdetail" method="POST" name="form32" id="form32">
                                                                                                                 <div class="form-group">
                                                             无
                                                         </div>
@@ -4085,33 +4239,7 @@
     "msg": "成功",
     "time": "1571492001",
     "data": {
-        "id"://购物车ID
-          "user_id"://用户ID
-          "pic_id"://图片的ID
-          "video_id"://视频的ID
-          "pic":[
-                "id"://图片ID
-               "title"://图片标题
-               "thumbnail"://缩略图
-               "url"://高清百度云盘地址
-               "price"://普通价格
-               "vip_price"://vip价格
-          ],
-          "video":[
-               "id"://视频ID
-               "title"://视频标题
-               "thumbnail"://视频封面图片
-               "video"://视频地址
-               "two_url"://2K视频云盘地址
-               "four_url"://4k视频云盘地址
-               "eight_url"://8k视频云盘地址
-               "price"://2k视频原价格
-               "four_price"://4k视频原价格
-               "eight_price"://8k视频原价格
-               "vip_price"://2k会员价格
-               "four_vipprice"://4k会员价格
-               "eight_vipprice"://8k会员价格
-          ]
+    "text":       //会员须知内容
     }
     }</pre>
                                         </div>
@@ -4255,7 +4383,7 @@
                     <div class="panel-heading" id="heading-31">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion31" href="#collapseOne31"> 会员须知 <span class="text-muted">/api/user/vipdetail</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion31" href="#collapseOne31"> 会员介绍 <span class="text-muted">/api/user/vipdesc</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne31" class="panel-collapse collapse">
@@ -4273,7 +4401,7 @@
 
                                 <div class="tab-pane active" id="info31">
                                     <div class="well">
-                                        会员须知                                    </div>
+                                        会员介绍                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -4327,7 +4455,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/user/vipdetail" method="POST" name="form31" id="form31">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/vipdesc" method="POST" name="form31" id="form31">
                                                                                                                 <div class="form-group">
                                                             无
                                                         </div>
@@ -4367,7 +4495,7 @@
     "msg": "成功",
     "time": "1571492001",
     "data": {
-    "text":       //会员须知内容
+        "content":       //会员介绍内容
     }
     }</pre>
                                         </div>
@@ -4382,7 +4510,7 @@
                     <div class="panel-heading" id="heading-30">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion30" href="#collapseOne30"> 会员介绍 <span class="text-muted">/api/user/vipdesc</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion30" href="#collapseOne30"> 创建开通会员订单 <span class="text-muted">/api/user/viporder</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne30" class="panel-collapse collapse">
@@ -4400,7 +4528,7 @@
 
                                 <div class="tab-pane active" id="info30">
                                     <div class="well">
-                                        会员介绍                                    </div>
+                                        创建开通会员订单                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -4427,7 +4555,24 @@
                                     <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>total</td>
+                                                        <td>float</td>
+                                                        <td>是</td>
+                                                        <td>金额</td>
+                                                    </tr>
+                                                                                                    </tbody>
+                                            </table>
                                                                                     </div>
                                     </div>
                                     <div class="panel panel-default">
@@ -4454,9 +4599,10 @@
                                                                                         <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/user/vipdesc" method="POST" name="form30" id="form30">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/viporder" method="POST" name="form30" id="form30">
                                                                                                                 <div class="form-group">
-                                                            无
+                                                            <label class="control-label" for="total">total</label>
+                                                            <input type="float" class="form-control input-sm" id="total" required placeholder="金额" name="total">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="30">提交</button>
@@ -4490,13 +4636,13 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response30">{
-    "code": 1,
-    "msg": "成功",
-    "time": "1571492001",
-    "data": {
-        "content":       //会员介绍内容
-    }
-    }</pre>
+        "code": 1,
+        "msg": "成功",
+        "time": "1571492001",
+        "data": {
+            "order_id"://订单ID
+        }
+        }</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -4509,7 +4655,7 @@
                     <div class="panel-heading" id="heading-29">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion29" href="#collapseOne29"> 创建开通会员订单 <span class="text-muted">/api/user/viporder</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion29" href="#collapseOne29"> 创建充值订单 <span class="text-muted">/api/user/toporder</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne29" class="panel-collapse collapse">
@@ -4527,7 +4673,7 @@
 
                                 <div class="tab-pane active" id="info29">
                                     <div class="well">
-                                        创建开通会员订单                                    </div>
+                                        创建充值订单                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -4565,10 +4711,10 @@
                                                 </thead>
                                                 <tbody>
                                                                                                         <tr>
-                                                        <td>total</td>
+                                                        <td>money</td>
                                                         <td>float</td>
                                                         <td>是</td>
-                                                        <td>金额</td>
+                                                        <td>充值金额</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -4598,10 +4744,10 @@
                                                                                         <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/user/viporder" method="POST" name="form29" id="form29">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/toporder" method="POST" name="form29" id="form29">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="total">total</label>
-                                                            <input type="float" class="form-control input-sm" id="total" required placeholder="金额" name="total">
+                                                            <label class="control-label" for="money">money</label>
+                                                            <input type="float" class="form-control input-sm" id="money" required placeholder="充值金额" name="money">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="29">提交</button>
@@ -4654,7 +4800,7 @@
                     <div class="panel-heading" id="heading-28">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion28" href="#collapseOne28"> 创建充值订单 <span class="text-muted">/api/user/toporder</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion28" href="#collapseOne28"> 我的 <span class="text-muted">/api/user/mine</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne28" class="panel-collapse collapse">
@@ -4672,7 +4818,7 @@
 
                                 <div class="tab-pane active" id="info28">
                                     <div class="well">
-                                        创建充值订单                                    </div>
+                                        我的                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -4699,24 +4845,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>money</td>
-                                                        <td>float</td>
-                                                        <td>是</td>
-                                                        <td>充值金额</td>
-                                                    </tr>
-                                                                                                    </tbody>
-                                            </table>
+                                                                                        无
                                                                                     </div>
                                     </div>
                                     <div class="panel panel-default">
@@ -4743,10 +4872,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/user/toporder" method="POST" name="form28" id="form28">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/mine" method="POST" name="form28" id="form28">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="money">money</label>
-                                                            <input type="float" class="form-control input-sm" id="money" required placeholder="充值金额" name="money">
+                                                            无
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="28">提交</button>
@@ -4784,9 +4912,11 @@
         "msg": "成功",
         "time": "1571492001",
         "data": {
-            "order_id"://订单ID
-        }
-        }</pre>
+            "id":       //用户ID
+            "nickname": //昵称,
+            "avatar":   //头像,
+            "money" :   //余额
+            "is_vip":   //是否为会员(0否 1是</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -4799,7 +4929,7 @@
                     <div class="panel-heading" id="heading-27">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion27" href="#collapseOne27"> 我的 <span class="text-muted">/api/user/mine</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion27" href="#collapseOne27"> 历史记录 <span class="text-muted">/api/user/history</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne27" class="panel-collapse collapse">
@@ -4817,7 +4947,7 @@
 
                                 <div class="tab-pane active" id="info27">
                                     <div class="well">
-                                        我的                                    </div>
+                                        历史记录                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -4871,7 +5001,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/user/mine" method="POST" name="form27" id="form27">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/history" method="POST" name="form27" id="form27">
                                                                                                                 <div class="form-group">
                                                             无
                                                         </div>
@@ -4907,15 +5037,14 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response27">{
-        "code": 1,
-        "msg": "成功",
-        "time": "1571492001",
-        "data": {
-            "id":       //用户ID
-            "nickname": //昵称,
-            "avatar":   //头像,
-            "money" :   //余额
-            "is_vip":   //是否为会员(0否 1是</pre>
+    "code": 1,
+    "msg": "成功",
+    "time": "1571492001",
+    "data": {
+        "id": 4,//记录id,
+        "title"://搜索的内容
+    }
+    }</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -4928,7 +5057,7 @@
                     <div class="panel-heading" id="heading-26">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion26" href="#collapseOne26"> 历史记录 <span class="text-muted">/api/user/history</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion26" href="#collapseOne26"> 视频详情 <span class="text-muted">/api/user/videodetail</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne26" class="panel-collapse collapse">
@@ -4946,7 +5075,7 @@
 
                                 <div class="tab-pane active" id="info26">
                                     <div class="well">
-                                        历史记录                                    </div>
+                                        视频详情                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -4973,7 +5102,24 @@
                                     <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>video_id</td>
+                                                        <td>inter</td>
+                                                        <td>是</td>
+                                                        <td>视频ID</td>
+                                                    </tr>
+                                                                                                    </tbody>
+                                            </table>
                                                                                     </div>
                                     </div>
                                     <div class="panel panel-default">
@@ -5000,9 +5146,10 @@
                                                                                         <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/user/history" method="POST" name="form26" id="form26">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/videodetail" method="POST" name="form26" id="form26">
                                                                                                                 <div class="form-group">
-                                                            无
+                                                            <label class="control-label" for="video_id">video_id</label>
+                                                            <input type="inter" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="26">提交</button>
@@ -5036,14 +5183,25 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response26">{
-    "code": 1,
-    "msg": "成功",
-    "time": "1571492001",
-    "data": {
-        "id": 4,//记录id,
-        "title"://搜索的内容
-    }
-    }</pre>
+        "code": 1,
+        "msg": "成功",
+        "time": "1571492001",
+        "data": {
+            "id": 4,//视频id,
+            "title"://标题
+            "thumbnail": //视频封面图,
+            "video": //2K视频地址,
+            "water_url"://小样视频网址
+            "price"://2K价格,
+            "vip_price"://2Kvip价格,
+            "four_price"://4K价格,
+            "four_vipprice"://4Kvip价格,
+            "eight_price"://8K价格,
+            "eight_vipprice"://8Kvip价格,
+            "content"://图片介绍,
+            "is_vip"://是否为会员(0否 1是)
+        }
+        }</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -5056,7 +5214,7 @@
                     <div class="panel-heading" id="heading-25">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion25" href="#collapseOne25"> 视频详情 <span class="text-muted">/api/user/videodetail</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion25" href="#collapseOne25"> 图片详情 <span class="text-muted">/api/user/picdetail</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne25" class="panel-collapse collapse">
@@ -5074,7 +5232,7 @@
 
                                 <div class="tab-pane active" id="info25">
                                     <div class="well">
-                                        视频详情                                    </div>
+                                        图片详情                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -5112,10 +5270,10 @@
                                                 </thead>
                                                 <tbody>
                                                                                                         <tr>
-                                                        <td>video_id</td>
+                                                        <td>pic_id</td>
                                                         <td>inter</td>
                                                         <td>是</td>
-                                                        <td>视频ID</td>
+                                                        <td>图片ID</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -5145,10 +5303,10 @@
                                                                                         <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/user/videodetail" method="POST" name="form25" id="form25">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/picdetail" method="POST" name="form25" id="form25">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="video_id">video_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
+                                                            <label class="control-label" for="pic_id">pic_id</label>
+                                                            <input type="inter" class="form-control input-sm" id="pic_id" required placeholder="图片ID" name="pic_id">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="25">提交</button>
@@ -5181,26 +5339,22 @@
                                 <div class="tab-pane" id="sample25">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response25">{
-        "code": 1,
-        "msg": "成功",
-        "time": "1571492001",
-        "data": {
-            "id": 4,//视频id,
-            "title"://标题
-            "thumbnail": //视频封面图,
-            "video": //2K视频地址,
-            "water_url"://小样视频网址
-            "price"://2K价格,
-            "vip_price"://2Kvip价格,
-            "four_price"://4K价格,
-            "four_vipprice"://4Kvip价格,
-            "eight_price"://8K价格,
-            "eight_vipprice"://8Kvip价格,
-            "content"://图片介绍,
-            "is_vip"://是否为会员(0否 1是)
+                                            <pre id="sample_response25">{
+        "code": 1,
+        "msg": "成功",
+        "time": "1571492001",
+        "data": {
+            "id": 4,//图片id,
+            "title"://标题
+            "thumbnail": //缩略图,
+            "water_url": //小样带水印的图片地址,
+           "price"://正常价格,
+           "vip_price"://vip价格,
+           "content"://图片介绍,
+           "is_vip"://是否为会员(0否 1是)
+
         }
-        }</pre>
+    }</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -5213,7 +5367,7 @@
                     <div class="panel-heading" id="heading-24">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion24" href="#collapseOne24"> 图片详情 <span class="text-muted">/api/user/picdetail</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion24" href="#collapseOne24"> 精美大片列表 <span class="text-muted">/api/user/won</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne24" class="panel-collapse collapse">
@@ -5231,7 +5385,7 @@
 
                                 <div class="tab-pane active" id="info24">
                                     <div class="well">
-                                        图片详情                                    </div>
+                                        精美大片列表                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -5269,10 +5423,16 @@
                                                 </thead>
                                                 <tbody>
                                                                                                         <tr>
-                                                        <td>pic_id</td>
+                                                        <td>page</td>
                                                         <td>inter</td>
-                                                        <td>是</td>
-                                                        <td>图片ID</td>
+                                                        <td>否</td>
+                                                        <td>当前页(默认1</td>
+                                                    </tr>
+                                                                                                        <tr>
+                                                        <td>pageNum</td>
+                                                        <td>inter</td>
+                                                        <td>否</td>
+                                                        <td>每页显示数据个数(默认10)</td>
                                                     </tr>
                                                                                                     </tbody>
                                             </table>
@@ -5302,10 +5462,14 @@
                                                                                         <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/user/picdetail" method="POST" name="form24" id="form24">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/won" method="POST" name="form24" id="form24">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="pic_id">pic_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="pic_id" required placeholder="图片ID" name="pic_id">
+                                                            <label class="control-label" for="page">page</label>
+                                                            <input type="inter" class="form-control input-sm" id="page"  placeholder="当前页(默认1" name="page">
+                                                        </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="pageNum">pageNum</label>
+                                                            <input type="inter" class="form-control input-sm" id="pageNum"  placeholder="每页显示数据个数(默认10)" name="pageNum">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="24">提交</button>
@@ -5339,20 +5503,14 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response24">{
-        "code": 1,
-        "msg": "成功",
-        "time": "1571492001",
-        "data": {
-            "id": 4,//图片id,
-            "title"://标题
-            "thumbnail": //缩略图,
-            "water_url": //小样带水印的图片地址,
-           "price"://正常价格,
-           "vip_price"://vip价格,
-           "content"://图片介绍,
-           "is_vip"://是否为会员(0否 1是)
-
-        }
+    "code": 1,
+    "msg": "成功",
+    "time": "1571492001",
+    "data": {
+    "id": //图片id,
+    "thumbnail": //视频封面,
+    "video"://视频地址
+    }
     }</pre>
                                         </div>
                                     </div>
@@ -5366,7 +5524,7 @@
                     <div class="panel-heading" id="heading-23">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion23" href="#collapseOne23"> 精美大片列表 <span class="text-muted">/api/user/won</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion23" href="#collapseOne23"> 视频列表 <span class="text-muted">/api/user/video</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne23" class="panel-collapse collapse">
@@ -5384,7 +5542,7 @@
 
                                 <div class="tab-pane active" id="info23">
                                     <div class="well">
-                                        精美大片列表                                    </div>
+                                        视频列表                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -5422,6 +5580,12 @@
                                                 </thead>
                                                 <tbody>
                                                                                                         <tr>
+                                                        <td>type_id</td>
+                                                        <td>inter</td>
+                                                        <td>否</td>
+                                                        <td>地区ID</td>
+                                                    </tr>
+                                                                                                        <tr>
                                                         <td>page</td>
                                                         <td>inter</td>
                                                         <td>否</td>
@@ -5461,7 +5625,11 @@
                                                                                         <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/user/won" method="POST" name="form23" id="form23">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/video" method="POST" name="form23" id="form23">
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="type_id">type_id</label>
+                                                            <input type="inter" class="form-control input-sm" id="type_id"  placeholder="地区ID" name="type_id">
+                                                        </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="page">page</label>
                                                             <input type="inter" class="form-control input-sm" id="page"  placeholder="当前页(默认1" name="page">
@@ -5502,15 +5670,15 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response23">{
-    "code": 1,
-    "msg": "成功",
-    "time": "1571492001",
-    "data": {
-    "id": //图片id,
-    "thumbnail": //视频封面,
-    "video"://视频地址
-    }
-    }</pre>
+        "code": 1,
+        "msg": "成功",
+        "time": "1571492001",
+        "data": {
+            "id": //图片id,
+            "thumbnail": //视频封面,
+            "video"://视频地址
+        }
+        }</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -5523,7 +5691,7 @@
                     <div class="panel-heading" id="heading-22">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion22" href="#collapseOne22"> 视频列表 <span class="text-muted">/api/user/video</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion22" href="#collapseOne22"> 分类下的图片视频 <span class="text-muted">/api/user/pic_video</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne22" class="panel-collapse collapse">
@@ -5541,7 +5709,7 @@
 
                                 <div class="tab-pane active" id="info22">
                                     <div class="well">
-                                        视频列表                                    </div>
+                                        分类下的图片视频                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -5581,10 +5749,16 @@
                                                                                                         <tr>
                                                         <td>type_id</td>
                                                         <td>inter</td>
-                                                        <td>否</td>
+                                                        <td>是</td>
                                                         <td>地区ID</td>
                                                     </tr>
                                                                                                         <tr>
+                                                        <td>type</td>
+                                                        <td>inter</td>
+                                                        <td>否</td>
+                                                        <td>类型ID(图片为1 视频为2)</td>
+                                                    </tr>
+                                                                                                        <tr>
                                                         <td>page</td>
                                                         <td>inter</td>
                                                         <td>否</td>
@@ -5624,10 +5798,14 @@
                                                                                         <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/user/video" method="POST" name="form22" id="form22">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/pic_video" method="POST" name="form22" id="form22">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="type_id">type_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="type_id"  placeholder="地区ID" name="type_id">
+                                                            <input type="inter" class="form-control input-sm" id="type_id" required placeholder="地区ID" name="type_id">
+                                                        </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="type">type</label>
+                                                            <input type="inter" class="form-control input-sm" id="type"  placeholder="类型ID(图片为1 视频为2)" name="type">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="page">page</label>
@@ -5673,9 +5851,8 @@
         "msg": "成功",
         "time": "1571492001",
         "data": {
-            "id": //图片id,
-            "thumbnail": //视频封面,
-            "video"://视频地址
+            "id": 4,//图片id,
+            "thumbnail": //缩略图,
         }
         }</pre>
                                         </div>
@@ -5690,7 +5867,7 @@
                     <div class="panel-heading" id="heading-21">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion21" href="#collapseOne21"> 分类下的图片视频 <span class="text-muted">/api/user/pic_video</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion21" href="#collapseOne21"> 图片列表 <span class="text-muted">/api/user/pic</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne21" class="panel-collapse collapse">
@@ -5708,7 +5885,7 @@
 
                                 <div class="tab-pane active" id="info21">
                                     <div class="well">
-                                        分类下的图片视频                                    </div>
+                                        图片列表                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -5748,14 +5925,8 @@
                                                                                                         <tr>
                                                         <td>type_id</td>
                                                         <td>inter</td>
-                                                        <td>是</td>
-                                                        <td>地区ID</td>
-                                                    </tr>
-                                                                                                        <tr>
-                                                        <td>type</td>
-                                                        <td>inter</td>
                                                         <td>否</td>
-                                                        <td>类型ID(图片为1 视频为2)</td>
+                                                        <td>地区ID</td>
                                                     </tr>
                                                                                                         <tr>
                                                         <td>page</td>
@@ -5797,14 +5968,10 @@
                                                                                         <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/user/pic_video" method="POST" name="form21" id="form21">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/pic" method="POST" name="form21" id="form21">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="type_id">type_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="type_id" required placeholder="地区ID" name="type_id">
-                                                        </div>
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="type">type</label>
-                                                            <input type="inter" class="form-control input-sm" id="type"  placeholder="类型ID(图片为1 视频为2)" name="type">
+                                                            <input type="inter" class="form-control input-sm" id="type_id"  placeholder="地区ID" name="type_id">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="page">page</label>
@@ -5846,14 +6013,14 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response21">{
-        "code": 1,
-        "msg": "成功",
-        "time": "1571492001",
-        "data": {
-            "id": 4,//图片id,
-            "thumbnail": //缩略图,
-        }
-        }</pre>
+    "code": 1,
+    "msg": "成功",
+    "time": "1571492001",
+    "data": {
+        "id": 4,//图片id,
+        "thumbnail": //缩略图,
+    }
+    }</pre>
                                         </div>
                                     </div>
                                 </div><!-- #sample -->
@@ -5866,7 +6033,7 @@
                     <div class="panel-heading" id="heading-20">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion20" href="#collapseOne20"> 图片列表 <span class="text-muted">/api/user/pic</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion20" href="#collapseOne20"> 搜索页 <span class="text-muted">/api/user/search</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne20" class="panel-collapse collapse">
@@ -5884,7 +6051,7 @@
 
                                 <div class="tab-pane active" id="info20">
                                     <div class="well">
-                                        图片列表                                    </div>
+                                        搜索页                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -5925,7 +6092,13 @@
                                                         <td>type_id</td>
                                                         <td>inter</td>
                                                         <td>否</td>
-                                                        <td>地区ID</td>
+                                                        <td>视频/图片  (视频为1 图片为2 精美大片为3)</td>
+                                                    </tr>
+                                                                                                        <tr>
+                                                        <td>keyword</td>
+                                                        <td>string</td>
+                                                        <td>是</td>
+                                                        <td>关键字</td>
                                                     </tr>
                                                                                                         <tr>
                                                         <td>page</td>
@@ -5967,10 +6140,14 @@
                                                                                         <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/user/pic" method="POST" name="form20" id="form20">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/search" method="POST" name="form20" id="form20">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="type_id">type_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="type_id"  placeholder="地区ID" name="type_id">
+                                                            <input type="inter" class="form-control input-sm" id="type_id"  placeholder="视频/图片  (视频为1 图片为2 精美大片为3)" name="type_id">
+                                                        </div>
+                                                                                                                <div class="form-group">
+                                                            <label class="control-label" for="keyword">keyword</label>
+                                                            <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="page">page</label>
@@ -6012,13 +6189,14 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response20">{
-    "code": 1,
-    "msg": "成功",
-    "time": "1571492001",
-    "data": {
-        "id": 4,//图片id,
-        "thumbnail": //缩略图,
-    }
+        "code": 1,
+        "msg": "成功",
+        "time": "1571492001",
+        "data": {
+            "id": 4,//视频id/图片id,
+            "thumbnail": //视频封面图地址/图片地址,
+            "video": //视频路径/精美大片视频路径,
+        }
     }</pre>
                                         </div>
                                     </div>
@@ -6032,7 +6210,7 @@
                     <div class="panel-heading" id="heading-19">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion19" href="#collapseOne19"> 搜索页 <span class="text-muted">/api/user/search</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion19" href="#collapseOne19"> 图片分类(类型 <span class="text-muted">/api/user/pictype</span></a>
                         </h4>
                     </div>
                     <div id="collapseOne19" class="panel-collapse collapse">
@@ -6050,7 +6228,7 @@
 
                                 <div class="tab-pane active" id="info19">
                                     <div class="well">
-                                        搜索页                                    </div>
+                                        图片分类(类型                                    </div>
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><strong>Headers</strong></div>
                                         <div class="panel-body">
@@ -6077,42 +6255,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>type_id</td>
-                                                        <td>inter</td>
-                                                        <td>否</td>
-                                                        <td>视频/图片  (视频为1 图片为2 精美大片为3)</td>
-                                                    </tr>
-                                                                                                        <tr>
-                                                        <td>keyword</td>
-                                                        <td>string</td>
-                                                        <td>是</td>
-                                                        <td>关键字</td>
-                                                    </tr>
-                                                                                                        <tr>
-                                                        <td>page</td>
-                                                        <td>inter</td>
-                                                        <td>否</td>
-                                                        <td>当前页(默认1</td>
-                                                    </tr>
-                                                                                                        <tr>
-                                                        <td>pageNum</td>
-                                                        <td>inter</td>
-                                                        <td>否</td>
-                                                        <td>每页显示数据个数(默认10)</td>
-                                                    </tr>
-                                                                                                    </tbody>
-                                            </table>
+                                                                                        无
                                                                                     </div>
                                     </div>
                                     <div class="panel panel-default">
@@ -6139,22 +6282,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/user/search" method="POST" name="form19" id="form19">
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="type_id">type_id</label>
-                                                            <input type="inter" class="form-control input-sm" id="type_id"  placeholder="视频/图片  (视频为1 图片为2 精美大片为3)" name="type_id">
-                                                        </div>
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="keyword">keyword</label>
-                                                            <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword">
-                                                        </div>
-                                                                                                                <div class="form-group">
-                                                            <label class="control-label" for="page">page</label>
-                                                            <input type="inter" class="form-control input-sm" id="page"  placeholder="当前页(默认1" name="page">
-                                                        </div>
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/pictype" method="POST" name="form19" id="form19">
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="pageNum">pageNum</label>
-                                                            <input type="inter" class="form-control input-sm" id="pageNum"  placeholder="每页显示数据个数(默认10)" name="pageNum">
+                                                            无
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <button type="submit" class="btn btn-success send" rel="19">提交</button>
@@ -6188,14 +6318,14 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <pre id="sample_response19">{
-        "code": 1,
-        "msg": "成功",
-        "time": "1571492001",
-        "data": {
-            "id": 4,//视频id/图片id,
-            "thumbnail": //视频封面图地址/图片地址,
-            "video": //视频路径/精美大片视频路径,
-        }
+    "code": 1,
+    "msg": "成功",
+    "time": "1571492001",
+    "data": {
+        "id": 4,//分类id
+        "typename": //分类名称
+        "thumbnail": //图片
+    }
     }</pre>
                                         </div>
                                     </div>
@@ -6335,26 +6465,26 @@
                     </div>
                 </div>
                                 <div class="panel panel-default">
-                    <div class="panel-heading" id="heading-47">
+                    <div class="panel-heading" id="heading-48">
                         <h4 class="panel-title">
                             <span class="label label-primary">POST</span>
-                            <a data-toggle="collapse" data-parent="#accordion47" href="#collapseOne47"> 绑定用户手机号 <span class="text-muted">/api/user/phone</span></a>
+                            <a data-toggle="collapse" data-parent="#accordion48" href="#collapseOne48"> 绑定用户手机号 <span class="text-muted">/api/user/phone</span></a>
                         </h4>
                     </div>
-                    <div id="collapseOne47" class="panel-collapse collapse">
+                    <div id="collapseOne48" class="panel-collapse collapse">
                         <div class="panel-body">
 
                             <!-- Nav tabs -->
-                            <ul class="nav nav-tabs" id="doctab47">
-                                <li class="active"><a href="#info47" data-toggle="tab">基础信息</a></li>
-                                <li><a href="#sandbox47" data-toggle="tab">在线测试</a></li>
-                                <li><a href="#sample47" data-toggle="tab">返回示例</a></li>
+                            <ul class="nav nav-tabs" id="doctab48">
+                                <li class="active"><a href="#info48" data-toggle="tab">基础信息</a></li>
+                                <li><a href="#sandbox48" data-toggle="tab">在线测试</a></li>
+                                <li><a href="#sample48" data-toggle="tab">返回示例</a></li>
                             </ul>
 
                             <!-- Tab panes -->
                             <div class="tab-content">
 
-                                <div class="tab-pane active" id="info47">
+                                <div class="tab-pane active" id="info48">
                                     <div class="well">
                                         绑定用户手机号                                    </div>
                                     <div class="panel panel-default">
@@ -6410,7 +6540,7 @@
                                     </div>
                                 </div><!-- #info -->
 
-                                <div class="tab-pane" id="sandbox47">
+                                <div class="tab-pane" id="sandbox48">
                                     <div class="row">
                                         <div class="col-md-12">
                                                                                         <div class="panel panel-default">
@@ -6427,14 +6557,14 @@
                                                                                         <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/user/phone" method="POST" name="form47" id="form47">
+                                                    <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/phone" method="POST" name="form48" id="form48">
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="phone">phone</label>
                                                             <input type="string" class="form-control input-sm" id="phone" required placeholder="手机号" name="phone">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <button type="submit" class="btn btn-success send" rel="47">提交</button>
-                                                            <button type="reset" class="btn btn-info" rel="47">重置</button>
+                                                            <button type="submit" class="btn btn-success send" rel="48">提交</button>
+                                                            <button type="reset" class="btn btn-info" rel="48">重置</button>
                                                         </div>
                                                     </form>
                                                 </div>
@@ -6444,8 +6574,8 @@
                                                 <div class="panel-body">
                                                     <div class="row">
                                                         <div class="col-md-12" style="overflow-x:auto">
-                                                            <pre id="response_headers47"></pre>
-                                                            <pre id="response47"></pre>
+                                                            <pre id="response_headers48"></pre>
+                                                            <pre id="response48"></pre>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -6460,10 +6590,10 @@
                                     </div>
                                 </div><!-- #sandbox -->
 
-                                <div class="tab-pane" id="sample47">
+                                <div class="tab-pane" id="sample48">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <pre id="sample_response47">{
+                                            <pre id="sample_response48">{
         "code": 1,
         "msg": "成功",
         "time": "1571492001",
@@ -6482,7 +6612,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2019-12-04 11:29:37                </div>
+                    Generated on 2019-12-07 10:30:34                </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 842e16e..169ac04 100644
--- a/public/assets/js/backend/pic.js
+++ b/public/assets/js/backend/pic.js
@@ -32,6 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'keyword', title: __('Keyword'),operate:false},
                         {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
                         {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
+                        {field: 'pictype_ids', title: __('Pictype_ids'),searchList:$.getJSON('pic/pictype')},
                         {field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
                         {field: 'url', title: __('Url'),operate:false, formatter: Table.api.formatter.url},
                         {field: 'code', title: __('Code'),operate:false},
diff --git a/public/assets/js/backend/pictype.js b/public/assets/js/backend/pictype.js
new file mode 100644
index 0000000..46ba596
--- /dev/null
+++ b/public/assets/js/backend/pictype.js
@@ -0,0 +1,53 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'pictype/index' + location.search,
+                    add_url: 'pictype/add',
+                    edit_url: 'pictype/edit',
+                    del_url: 'pictype/del',
+                    multi_url: 'pictype/multi',
+                    table: 'pictype',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'typename', title: __('Typename')},
+                        {field: 'thumbnail', title: __('Thumbnail'),  formatter:Table.api.formatter.image},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});
\ No newline at end of file
--
libgit2 0.24.0