王晓刚 / advertising · 提交

转到一个项目

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

我的钱包

内嵌 并排对比
正在显示 3 个修改的文件 包含 41 行增加 和 47 行删除
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/public.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/public.css" afterDir="false" /> 9 + <change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />
10 </list> 10 </list>
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" /> 12 <option name="TRACKING_ENABLED" value="true" />
@@ -34,11 +34,11 @@ @@ -34,11 +34,11 @@
34 </component> 34 </component>
35 <component name="FileEditorManager"> 35 <component name="FileEditorManager">
36 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 36 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
37 - <file leaf-file-name="Member.php" pinned="false" current-in-tab="false"> 37 + <file leaf-file-name="Member.php" pinned="false" current-in-tab="true">
38 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> 38 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state relative-caret-position="323">  
41 - <caret line="250" column="32" selection-start-line="250" selection-start-column="20" selection-end-line="250" selection-end-column="32" /> 40 + <state relative-caret-position="578">
  41 + <caret line="256" column="78" lean-forward="true" selection-start-line="256" selection-start-column="78" selection-end-line="256" selection-end-column="78" />
42 </state> 42 </state>
43 </provider> 43 </provider>
44 </entry> 44 </entry>
@@ -46,17 +46,8 @@ @@ -46,17 +46,8 @@
46 <file leaf-file-name="earnings_log.html" pinned="false" current-in-tab="false"> 46 <file leaf-file-name="earnings_log.html" pinned="false" current-in-tab="false">
47 <entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html"> 47 <entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html">
48 <provider selected="true" editor-type-id="text-editor"> 48 <provider selected="true" editor-type-id="text-editor">
49 - <state relative-caret-position="595">  
50 - <caret line="35" column="47" lean-forward="true" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" />  
51 - </state>  
52 - </provider>  
53 - </entry>  
54 - </file>  
55 - <file leaf-file-name="public.css" pinned="false" current-in-tab="true">  
56 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">  
57 - <provider selected="true" editor-type-id="text-editor">  
58 - <state relative-caret-position="691">  
59 - <caret line="253" column="19" lean-forward="true" selection-start-line="253" selection-start-column="19" selection-end-line="253" selection-end-column="19" /> 49 + <state relative-caret-position="357">
  50 + <caret line="21" column="65" lean-forward="true" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
60 </state> 51 </state>
61 </provider> 52 </provider>
62 </entry> 53 </entry>
@@ -217,10 +208,10 @@ @@ -217,10 +208,10 @@
217 <option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" /> 208 <option value="$PROJECT_DIR$/public/assets/advertising/css/record.css" />
218 <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" /> 209 <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
219 <option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" /> 210 <option value="$PROJECT_DIR$/application/home/view/member/my_withdraw.html" />
220 - <option value="$PROJECT_DIR$/application/home/controller/Member.php" />  
221 <option value="$PROJECT_DIR$/application/home/view/member/withdraw_information.html" /> 211 <option value="$PROJECT_DIR$/application/home/view/member/withdraw_information.html" />
222 - <option value="$PROJECT_DIR$/application/home/view/member/earnings_log.html" />  
223 <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" /> 212 <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
  213 + <option value="$PROJECT_DIR$/application/home/view/member/earnings_log.html" />
  214 + <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
224 </list> 215 </list>
225 </option> 216 </option>
226 </component> 217 </component>
@@ -469,21 +460,7 @@ @@ -469,21 +460,7 @@
469 <workItem from="1572914713443" duration="29898000" /> 460 <workItem from="1572914713443" duration="29898000" />
470 <workItem from="1573000530976" duration="6061000" /> 461 <workItem from="1573000530976" duration="6061000" />
471 <workItem from="1573087576825" duration="5555000" /> 462 <workItem from="1573087576825" duration="5555000" />
472 - <workItem from="1573174620844" duration="4902000" />  
473 - </task>  
474 - <task id="LOCAL-00215" summary=" 音频">  
475 - <created>1572945202216</created>  
476 - <option name="number" value="00215" />  
477 - <option name="presentableId" value="LOCAL-00215" />  
478 - <option name="project" value="LOCAL" />  
479 - <updated>1572945202216</updated>  
480 - </task>  
481 - <task id="LOCAL-00216" summary=" 音频">  
482 - <created>1572945447367</created>  
483 - <option name="number" value="00216" />  
484 - <option name="presentableId" value="LOCAL-00216" />  
485 - <option name="project" value="LOCAL" />  
486 - <updated>1572945447367</updated> 463 + <workItem from="1573174620844" duration="5307000" />
487 </task> 464 </task>
488 <task id="LOCAL-00217" summary=" 音频"> 465 <task id="LOCAL-00217" summary=" 音频">
489 <created>1572945485768</created> 466 <created>1572945485768</created>
@@ -814,11 +791,25 @@ @@ -814,11 +791,25 @@
814 <option name="project" value="LOCAL" /> 791 <option name="project" value="LOCAL" />
815 <updated>1573180178370</updated> 792 <updated>1573180178370</updated>
816 </task> 793 </task>
817 - <option name="localTasksCounter" value="264" /> 794 + <task id="LOCAL-00264" summary="我的钱包">
  795 + <created>1573180223112</created>
  796 + <option name="number" value="00264" />
  797 + <option name="presentableId" value="LOCAL-00264" />
  798 + <option name="project" value="LOCAL" />
  799 + <updated>1573180223112</updated>
  800 + </task>
  801 + <task id="LOCAL-00265" summary="我的钱包">
  802 + <created>1573180527205</created>
  803 + <option name="number" value="00265" />
  804 + <option name="presentableId" value="LOCAL-00265" />
  805 + <option name="project" value="LOCAL" />
  806 + <updated>1573180527205</updated>
  807 + </task>
  808 + <option name="localTasksCounter" value="266" />
818 <servers /> 809 <servers />
819 </component> 810 </component>
820 <component name="TimeTrackingManager"> 811 <component name="TimeTrackingManager">
821 - <option name="totallyTimeSpent" value="345994000" /> 812 + <option name="totallyTimeSpent" value="346399000" />
822 </component> 813 </component>
823 <component name="ToolWindowManager"> 814 <component name="ToolWindowManager">
824 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 815 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1184,13 +1175,6 @@ @@ -1184,13 +1175,6 @@
1184 </state> 1175 </state>
1185 </provider> 1176 </provider>
1186 </entry> 1177 </entry>
1187 - <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">  
1188 - <provider selected="true" editor-type-id="text-editor">  
1189 - <state relative-caret-position="323">  
1190 - <caret line="250" column="32" selection-start-line="250" selection-start-column="20" selection-end-line="250" selection-end-column="32" />  
1191 - </state>  
1192 - </provider>  
1193 - </entry>  
1194 <entry file="file://$PROJECT_DIR$/application/home/view/member/withdraw_information.html"> 1178 <entry file="file://$PROJECT_DIR$/application/home/view/member/withdraw_information.html">
1195 <provider selected="true" editor-type-id="text-editor"> 1179 <provider selected="true" editor-type-id="text-editor">
1196 <state relative-caret-position="595"> 1180 <state relative-caret-position="595">
@@ -1229,17 +1213,24 @@ @@ -1229,17 +1213,24 @@
1229 </state> 1213 </state>
1230 </provider> 1214 </provider>
1231 </entry> 1215 </entry>
  1216 + <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
  1217 + <provider selected="true" editor-type-id="text-editor">
  1218 + <state relative-caret-position="691">
  1219 + <caret line="253" column="19" lean-forward="true" selection-start-line="253" selection-start-column="19" selection-end-line="253" selection-end-column="19" />
  1220 + </state>
  1221 + </provider>
  1222 + </entry>
1232 <entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html"> 1223 <entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html">
1233 <provider selected="true" editor-type-id="text-editor"> 1224 <provider selected="true" editor-type-id="text-editor">
1234 - <state relative-caret-position="595">  
1235 - <caret line="35" column="47" lean-forward="true" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" /> 1225 + <state relative-caret-position="357">
  1226 + <caret line="21" column="65" lean-forward="true" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
1236 </state> 1227 </state>
1237 </provider> 1228 </provider>
1238 </entry> 1229 </entry>
1239 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css"> 1230 + <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
1240 <provider selected="true" editor-type-id="text-editor"> 1231 <provider selected="true" editor-type-id="text-editor">
1241 - <state relative-caret-position="691">  
1242 - <caret line="253" column="19" lean-forward="true" selection-start-line="253" selection-start-column="19" selection-end-line="253" selection-end-column="19" /> 1232 + <state relative-caret-position="578">
  1233 + <caret line="256" column="78" lean-forward="true" selection-start-line="256" selection-start-column="78" selection-end-line="256" selection-end-column="78" />
1243 </state> 1234 </state>
1244 </provider> 1235 </provider>
1245 </entry> 1236 </entry>
@@ -250,8 +250,11 @@ class Member extends WechatBase @@ -250,8 +250,11 @@ class Member extends WechatBase
250 */ 250 */
251 public function earnings_log(){ 251 public function earnings_log(){
252 $data = Db::name('user_exp_log')->where(['type'=>['in',[4,5]]])->order('id desc')->page(1,5)->select(); 252 $data = Db::name('user_exp_log')->where(['type'=>['in',[4,5]]])->order('id desc')->page(1,5)->select();
  253 + $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
253 foreach($data as $key => $vo){ 254 foreach($data as $key => $vo){
254 $data[$key]['createtime'] = date('Y年m月d日 H:i'); 255 $data[$key]['createtime'] = date('Y年m月d日 H:i');
  256 + //转换为人民币
  257 + $data[$key]['rmb'] = round($vo['exp']*$exp_ratio['ratio']*0.01,2);
255 } 258 }
256 $this->assign('data',$data); 259 $this->assign('data',$data);
257 $this->assign('title','收益记录'); 260 $this->assign('title','收益记录');
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 下级答题 19 下级答题
20 {/if} 20 {/if}
21 </div> 21 </div>
22 - <div class="record_num">+{$vo.exp}元</div> 22 + <div class="record_num">+{$vo.rmb}元</div>
23 </div> 23 </div>
24 <div class="record_date"> 24 <div class="record_date">
25 {$vo.createtime} 25 {$vo.createtime}