From a82423489cc74dfedfb561267261eb949563a8d2 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Wed, 20 Nov 2019 16:03:08 +0800
Subject: [PATCH] 修改视频详情

---
 .idea/workspace.xml                 | 76 +++++++++++++++++++++++++++++++++++++---------------------------------------
 application/api/controller/User.php |  2 +-
 public/api.html                     |  2 +-
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 32e8995..798b22d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,7 @@
 <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/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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -18,8 +16,8 @@
       <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="295">
-              <caret line="780" column="33" lean-forward="true" selection-start-line="780" selection-start-column="33" selection-end-line="780" selection-end-column="33" />
+            <state relative-caret-position="243">
+              <caret line="483" column="31" lean-forward="true" selection-start-line="483" selection-start-column="31" selection-end-line="483" selection-end-column="31" />
               <folding>
                 <element signature="e#38#68#0#PHP" expanded="true" />
                 <element signature="e#337#456#0#PHP" expanded="false" />
@@ -38,20 +36,20 @@
                 <element signature="e#11641#12325#0#PHP" expanded="false" />
                 <element signature="e#12330#14120#0#PHP" expanded="false" />
                 <element signature="e#14126#14996#0#PHP" expanded="false" />
-                <element signature="e#15001#17018#0#PHP" expanded="false" />
-                <element signature="e#17024#17401#0#PHP" expanded="false" />
-                <element signature="e#17406#17670#0#PHP" expanded="false" />
-                <element signature="e#17676#18181#0#PHP" expanded="false" />
-                <element signature="e#18186#18437#0#PHP" expanded="false" />
-                <element signature="e#18443#18922#0#PHP" expanded="false" />
-                <element signature="e#18927#19684#0#PHP" expanded="false" />
-                <element signature="e#19690#20053#0#PHP" expanded="false" />
-                <element signature="e#20058#20249#0#PHP" expanded="false" />
-                <element signature="e#20255#20613#0#PHP" expanded="false" />
-                <element signature="e#20618#20808#0#PHP" expanded="false" />
-                <element signature="e#20814#21957#0#PHP" expanded="false" />
-                <element signature="e#21962#23939#0#PHP" expanded="false" />
-                <element signature="e#23945#24436#0#PHP" expanded="false" />
+                <element signature="e#17014#17391#0#PHP" expanded="false" />
+                <element signature="e#17396#17660#0#PHP" expanded="false" />
+                <element signature="e#17666#18171#0#PHP" expanded="false" />
+                <element signature="e#18176#18427#0#PHP" expanded="false" />
+                <element signature="e#18433#18912#0#PHP" expanded="false" />
+                <element signature="e#18917#19674#0#PHP" expanded="false" />
+                <element signature="e#19680#20043#0#PHP" expanded="false" />
+                <element signature="e#20048#20239#0#PHP" expanded="false" />
+                <element signature="e#20245#20603#0#PHP" expanded="false" />
+                <element signature="e#20608#20798#0#PHP" expanded="false" />
+                <element signature="e#20804#21947#0#PHP" expanded="false" />
+                <element signature="e#21952#23929#0#PHP" expanded="false" />
+                <element signature="e#23935#24426#0#PHP" expanded="false" />
+                <element signature="e#24431#25644#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -131,8 +129,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="510" />
-    <option name="y" value="72" />
+    <option name="x" value="288" />
+    <option name="y" value="26" />
     <option name="width" value="1614" />
     <option name="height" value="977" />
   </component>
@@ -225,7 +223,7 @@
       <workItem from="1574141466352" duration="745000" />
       <workItem from="1574143209694" duration="3660000" />
       <workItem from="1574146994475" duration="23222000" />
-      <workItem from="1574209189943" duration="24458000" />
+      <workItem from="1574209189943" duration="24824000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -238,7 +236,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="96033000" />
+    <option name="totallyTimeSpent" value="96399000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -250,7 +248,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="510" y="72" width="1614" height="977" extended-state="0" />
+    <frame x="288" y="26" width="1614" height="977" extended-state="0" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15701416" 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" />
@@ -681,8 +679,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="780" column="33" lean-forward="true" selection-start-line="780" selection-start-column="33" selection-end-line="780" selection-end-column="33" />
+        <state relative-caret-position="243">
+          <caret line="483" column="31" lean-forward="true" selection-start-line="483" selection-start-column="31" selection-end-line="483" selection-end-column="31" />
           <folding>
             <element signature="e#38#68#0#PHP" expanded="true" />
             <element signature="e#337#456#0#PHP" expanded="false" />
@@ -701,20 +699,20 @@
             <element signature="e#11641#12325#0#PHP" expanded="false" />
             <element signature="e#12330#14120#0#PHP" expanded="false" />
             <element signature="e#14126#14996#0#PHP" expanded="false" />
-            <element signature="e#15001#17018#0#PHP" expanded="false" />
-            <element signature="e#17024#17401#0#PHP" expanded="false" />
-            <element signature="e#17406#17670#0#PHP" expanded="false" />
-            <element signature="e#17676#18181#0#PHP" expanded="false" />
-            <element signature="e#18186#18437#0#PHP" expanded="false" />
-            <element signature="e#18443#18922#0#PHP" expanded="false" />
-            <element signature="e#18927#19684#0#PHP" expanded="false" />
-            <element signature="e#19690#20053#0#PHP" expanded="false" />
-            <element signature="e#20058#20249#0#PHP" expanded="false" />
-            <element signature="e#20255#20613#0#PHP" expanded="false" />
-            <element signature="e#20618#20808#0#PHP" expanded="false" />
-            <element signature="e#20814#21957#0#PHP" expanded="false" />
-            <element signature="e#21962#23939#0#PHP" expanded="false" />
-            <element signature="e#23945#24436#0#PHP" expanded="false" />
+            <element signature="e#17014#17391#0#PHP" expanded="false" />
+            <element signature="e#17396#17660#0#PHP" expanded="false" />
+            <element signature="e#17666#18171#0#PHP" expanded="false" />
+            <element signature="e#18176#18427#0#PHP" expanded="false" />
+            <element signature="e#18433#18912#0#PHP" expanded="false" />
+            <element signature="e#18917#19674#0#PHP" expanded="false" />
+            <element signature="e#19680#20043#0#PHP" expanded="false" />
+            <element signature="e#20048#20239#0#PHP" expanded="false" />
+            <element signature="e#20245#20603#0#PHP" expanded="false" />
+            <element signature="e#20608#20798#0#PHP" expanded="false" />
+            <element signature="e#20804#21947#0#PHP" expanded="false" />
+            <element signature="e#21952#23929#0#PHP" expanded="false" />
+            <element signature="e#23935#24426#0#PHP" expanded="false" />
+            <element signature="e#24431#25644#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 3db83e4..4a27cc3 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -485,7 +485,7 @@ class User extends Api
                 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
             }
             $data = Db::name('video')
-                ->field('id,title,thumbnail,video,price,vip_price,water_url,content')
+                ->field('id,title,thumbnail,video,price,water_url,content')
                 ->where('id',$pic_id)
                 ->find();
             if(empty($data)){
diff --git a/public/api.html b/public/api.html
index 073d0ba..bfacff6 100644
--- a/public/api.html
+++ b/public/api.html
@@ -3116,7 +3116,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2019-11-20 15:56:47                </div>
+                    Generated on 2019-11-20 16:02:54                </div>
                 <div class="col-md-6" align="right">
                     <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>
--
libgit2 0.24.0