From 7f05612aeb225e7c92ea5848dea8dea08a0116c3 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Wed, 20 Nov 2019 16:13:38 +0800
Subject: [PATCH] 修改价格
---
.idea/workspace.xml | 75 +++++++++++++++++++++++++++++++++++++--------------------------------------
application/api/controller/User.php | 2 +-
public/api.html | 2 +-
3 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 619ecad..d118119 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<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" />
@@ -17,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="596">
- <caret line="547" column="13" lean-forward="true" selection-start-line="547" selection-start-column="13" selection-end-line="547" selection-end-column="13" />
+ <state relative-caret-position="421">
+ <caret line="540" column="13" lean-forward="true" selection-start-line="540" selection-start-column="13" selection-end-line="540" selection-end-column="13" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
@@ -39,20 +38,20 @@
<element signature="e#13430#14114#0#PHP" expanded="false" />
<element signature="e#14119#15909#0#PHP" expanded="false" />
<element signature="e#15915#16785#0#PHP" expanded="false" />
- <element signature="e#18803#19180#0#PHP" expanded="false" />
- <element signature="e#19185#19449#0#PHP" expanded="false" />
- <element signature="e#19455#19960#0#PHP" expanded="false" />
- <element signature="e#19965#20216#0#PHP" expanded="false" />
- <element signature="e#20222#20701#0#PHP" expanded="false" />
- <element signature="e#20706#21463#0#PHP" expanded="false" />
- <element signature="e#21469#21832#0#PHP" expanded="false" />
- <element signature="e#21837#22028#0#PHP" expanded="false" />
- <element signature="e#22034#22392#0#PHP" expanded="false" />
- <element signature="e#22397#22587#0#PHP" expanded="false" />
- <element signature="e#22593#23736#0#PHP" expanded="false" />
- <element signature="e#23741#25718#0#PHP" expanded="false" />
- <element signature="e#25724#26215#0#PHP" expanded="false" />
- <element signature="e#26220#27433#0#PHP" expanded="false" />
+ <element signature="e#18826#19203#0#PHP" expanded="false" />
+ <element signature="e#19208#19472#0#PHP" expanded="false" />
+ <element signature="e#19478#19983#0#PHP" expanded="false" />
+ <element signature="e#19988#20239#0#PHP" expanded="false" />
+ <element signature="e#20245#20724#0#PHP" expanded="false" />
+ <element signature="e#20729#21486#0#PHP" expanded="false" />
+ <element signature="e#21492#21855#0#PHP" expanded="false" />
+ <element signature="e#21860#22051#0#PHP" expanded="false" />
+ <element signature="e#22057#22415#0#PHP" expanded="false" />
+ <element signature="e#22420#22610#0#PHP" expanded="false" />
+ <element signature="e#22616#23759#0#PHP" expanded="false" />
+ <element signature="e#23764#25741#0#PHP" expanded="false" />
+ <element signature="e#25747#26238#0#PHP" expanded="false" />
+ <element signature="e#26243#27456#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -132,8 +131,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
- <option name="x" value="353" />
- <option name="y" value="11" />
+ <option name="x" value="279" />
+ <option name="y" value="10" />
<option name="width" value="1699" />
<option name="height" value="977" />
</component>
@@ -226,7 +225,7 @@
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="23222000" />
- <workItem from="1574209189943" duration="25360000" />
+ <workItem from="1574209189943" duration="25458000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -239,7 +238,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="96935000" />
+ <option name="totallyTimeSpent" value="97033000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -251,7 +250,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="353" y="11" width="1699" height="977" extended-state="0" />
+ <frame x="279" y="10" width="1699" 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.14887126" 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" />
@@ -682,8 +681,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="596">
- <caret line="547" column="13" lean-forward="true" selection-start-line="547" selection-start-column="13" selection-end-line="547" selection-end-column="13" />
+ <state relative-caret-position="421">
+ <caret line="540" column="13" lean-forward="true" selection-start-line="540" selection-start-column="13" selection-end-line="540" selection-end-column="13" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
@@ -704,20 +703,20 @@
<element signature="e#13430#14114#0#PHP" expanded="false" />
<element signature="e#14119#15909#0#PHP" expanded="false" />
<element signature="e#15915#16785#0#PHP" expanded="false" />
- <element signature="e#18803#19180#0#PHP" expanded="false" />
- <element signature="e#19185#19449#0#PHP" expanded="false" />
- <element signature="e#19455#19960#0#PHP" expanded="false" />
- <element signature="e#19965#20216#0#PHP" expanded="false" />
- <element signature="e#20222#20701#0#PHP" expanded="false" />
- <element signature="e#20706#21463#0#PHP" expanded="false" />
- <element signature="e#21469#21832#0#PHP" expanded="false" />
- <element signature="e#21837#22028#0#PHP" expanded="false" />
- <element signature="e#22034#22392#0#PHP" expanded="false" />
- <element signature="e#22397#22587#0#PHP" expanded="false" />
- <element signature="e#22593#23736#0#PHP" expanded="false" />
- <element signature="e#23741#25718#0#PHP" expanded="false" />
- <element signature="e#25724#26215#0#PHP" expanded="false" />
- <element signature="e#26220#27433#0#PHP" expanded="false" />
+ <element signature="e#18826#19203#0#PHP" expanded="false" />
+ <element signature="e#19208#19472#0#PHP" expanded="false" />
+ <element signature="e#19478#19983#0#PHP" expanded="false" />
+ <element signature="e#19988#20239#0#PHP" expanded="false" />
+ <element signature="e#20245#20724#0#PHP" expanded="false" />
+ <element signature="e#20729#21486#0#PHP" expanded="false" />
+ <element signature="e#21492#21855#0#PHP" expanded="false" />
+ <element signature="e#21860#22051#0#PHP" expanded="false" />
+ <element signature="e#22057#22415#0#PHP" expanded="false" />
+ <element signature="e#22420#22610#0#PHP" expanded="false" />
+ <element signature="e#22616#23759#0#PHP" expanded="false" />
+ <element signature="e#23764#25741#0#PHP" expanded="false" />
+ <element signature="e#25747#26238#0#PHP" expanded="false" />
+ <element signature="e#26243#27456#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 222dc5c..45117a1 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -540,7 +540,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
- ->field('id,title,thumbnail,video,price,water_url,content')
+ ->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
diff --git a/public/api.html b/public/api.html
index 7e0248a..798570e 100644
--- a/public/api.html
+++ b/public/api.html
@@ -3274,7 +3274,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2019-11-20 16:11:49 </div>
+ Generated on 2019-11-20 16:13:29 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
--
libgit2 0.24.0