消费记录

@@ -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="350">
-              <caret line="1341" column="13" lean-forward="true" selection-start-line="1341" selection-start-column="13" selection-end-line="1341" selection-end-column="13" />
+            <state relative-caret-position="731">
+              <caret line="1359" column="22" lean-forward="true" selection-start-line="1359" selection-start-column="22" selection-end-line="1359" selection-end-column="22" />
               <folding>
                 <element signature="e#365#484#0#PHP" expanded="false" />
                 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -174,9 +173,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="-34" />
-    <option name="y" value="112" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="321" />
+    <option name="y" value="12" />
     <option name="width" value="1806" />
     <option name="height" value="981" />
   </component>
@@ -274,7 +273,7 @@
       <workItem from="1574295812843" duration="20536000" />
       <workItem from="1574336957891" duration="1350000" />
       <workItem from="1574382087071" duration="22007000" />
-      <workItem from="1574410294356" duration="15040000" />
+      <workItem from="1574410294356" duration="15162000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -287,7 +286,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="176987000" />
+    <option name="totallyTimeSpent" value="177109000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -299,7 +298,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-34" y="112" width="1806" height="981" extended-state="1" />
+    <frame x="321" y="12" width="1806" height="981" 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.14833906" 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" />
@@ -714,8 +713,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="1341" column="13" lean-forward="true" selection-start-line="1341" selection-start-column="13" selection-end-line="1341" selection-end-column="13" />
+        <state relative-caret-position="731">
+          <caret line="1359" column="22" lean-forward="true" selection-start-line="1359" selection-start-column="22" selection-end-line="1359" selection-end-column="22" />
           <folding>
             <element signature="e#365#484#0#PHP" expanded="false" />
             <element signature="e#490#1228#0#PHP" expanded="false" />

@@ -1338,6 +1338,7 @@ class User extends Api
                 foreach ($v['pic_id'] as &$v1){
                     $v1 = Db::name('pic')->field('id,title,thumbnail,url,code,price')->where('id',$v1)->find();
                     $v1['thumbnail'] = $rule.$v1['thumbnail'];
+                    $v1['vipprice'] = $v1['price']*0.75;
                 }
             }
             if(!empty($v['video_id'])){
@@ -1347,6 +1348,9 @@ class User extends Api
                     $v2['info']['attr'] = $v2['attr'];
                     unset($v2['attr']);
                     $v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
+                    $v2['info']['vipprice'] = $v2['info']['price']*0.75;
+                    $v2['info']['four_vipprice'] = $v2['info']['four_price'] * 0.75;
+                    $v2['info']['eight_vipprice'] = $v2['info']['eight_price'] * 0.75;
                 }
             }
         }

@@ -5529,7 +5529,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2019-11-22 21:53:45                </div>
+                    Generated on 2019-11-22 21:56:23                </div>
                 <div class="col-md-6" align="right">
                     <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>