王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 4464815da7048eca4ea2672f706e7fc884ff5cd9 1 个父辈 e53a375a
1 个管道 的构建 通过 耗费 1 秒

我的钱包

内嵌 并排对比
正在显示 3 个修改的文件 包含 41 行增加 和 47 行删除
... ... @@ -6,7 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/public.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/public.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,11 +34,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
<file leaf-file-name="Member.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="250" column="32" selection-start-line="250" selection-start-column="20" selection-end-line="250" selection-end-column="32" />
<state relative-caret-position="578">
<caret line="256" column="78" lean-forward="true" selection-start-line="256" selection-start-column="78" selection-end-line="256" selection-end-column="78" />
</state>
</provider>
</entry>
... ... @@ -46,17 +46,8 @@
<file leaf-file-name="earnings_log.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="35" column="47" lean-forward="true" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="public.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="691">
<caret line="253" column="19" lean-forward="true" selection-start-line="253" selection-start-column="19" selection-end-line="253" selection-end-column="19" />
<state relative-caret-position="357">
<caret line="21" column="65" lean-forward="true" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
</state>
</provider>
</entry>
... ... @@ -217,10 +208,10 @@
<option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
<option value="$PROJECT_DIR$/application/home/view/member/withdraw_information.html" />
<option value="$PROJECT_DIR$/application/home/view/member/earnings_log.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
<option value="$PROJECT_DIR$/application/home/view/member/earnings_log.html" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
</list>
</option>
</component>
... ... @@ -469,21 +460,7 @@
<workItem from="1572914713443" duration="29898000" />
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="4902000" />
</task>
<task id="LOCAL-00215" summary=" 音频">
<created>1572945202216</created>
<option name="number" value="00215" />
<option name="presentableId" value="LOCAL-00215" />
<option name="project" value="LOCAL" />
<updated>1572945202216</updated>
</task>
<task id="LOCAL-00216" summary=" 音频">
<created>1572945447367</created>
<option name="number" value="00216" />
<option name="presentableId" value="LOCAL-00216" />
<option name="project" value="LOCAL" />
<updated>1572945447367</updated>
<workItem from="1573174620844" duration="5307000" />
</task>
<task id="LOCAL-00217" summary=" 音频">
<created>1572945485768</created>
... ... @@ -814,11 +791,25 @@
<option name="project" value="LOCAL" />
<updated>1573180178370</updated>
</task>
<option name="localTasksCounter" value="264" />
<task id="LOCAL-00264" summary="我的钱包">
<created>1573180223112</created>
<option name="number" value="00264" />
<option name="presentableId" value="LOCAL-00264" />
<option name="project" value="LOCAL" />
<updated>1573180223112</updated>
</task>
<task id="LOCAL-00265" summary="我的钱包">
<created>1573180527205</created>
<option name="number" value="00265" />
<option name="presentableId" value="LOCAL-00265" />
<option name="project" value="LOCAL" />
<updated>1573180527205</updated>
</task>
<option name="localTasksCounter" value="266" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="345994000" />
<option name="totallyTimeSpent" value="346399000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1184,13 +1175,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="250" column="32" selection-start-line="250" selection-start-column="20" selection-end-line="250" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/withdraw_information.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
... ... @@ -1229,17 +1213,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="691">
<caret line="253" column="19" lean-forward="true" selection-start-line="253" selection-start-column="19" selection-end-line="253" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="35" column="47" lean-forward="true" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" />
<state relative-caret-position="357">
<caret line="21" column="65" lean-forward="true" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="691">
<caret line="253" column="19" lean-forward="true" selection-start-line="253" selection-start-column="19" selection-end-line="253" selection-end-column="19" />
<state relative-caret-position="578">
<caret line="256" column="78" lean-forward="true" selection-start-line="256" selection-start-column="78" selection-end-line="256" selection-end-column="78" />
</state>
</provider>
</entry>
... ...
... ... @@ -250,8 +250,11 @@ class Member extends WechatBase
*/
public function earnings_log(){
$data = Db::name('user_exp_log')->where(['type'=>['in',[4,5]]])->order('id desc')->page(1,5)->select();
$exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
foreach($data as $key => $vo){
$data[$key]['createtime'] = date('Y年m月d日 H:i');
//转换为人民币
$data[$key]['rmb'] = round($vo['exp']*$exp_ratio['ratio']*0.01,2);
}
$this->assign('data',$data);
$this->assign('title','收益记录');
... ...
... ... @@ -19,7 +19,7 @@
下级答题
{/if}
</div>
<div class="record_num">+{$vo.exp}元</div>
<div class="record_num">+{$vo.rmb}元</div>
</div>
<div class="record_date">
{$vo.createtime}
... ...