王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 45396410a9077c79df1c04b93bc45343b8880384 1 个父辈 26743144
1 个管道 的构建 通过 耗费 1 秒

我的钱包

内嵌 并排对比
正在显示 2 个修改的文件 包含 44 行增加 和 45 行删除
... ... @@ -5,9 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/application/home/view/merchant/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Merchant.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/merchant/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/index.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -65,8 +63,8 @@
<file leaf-file-name="Share.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="657">
<caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
<state relative-caret-position="544">
<caret line="90" column="60" lean-forward="true" selection-start-line="90" selection-start-column="60" selection-end-line="90" selection-end-column="60" />
</state>
</provider>
</entry>
... ... @@ -83,20 +81,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="56" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
<state relative-caret-position="119">
<caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</state>
</provider>
</entry>
... ... @@ -416,21 +414,7 @@
<workItem from="1572914713443" duration="29898000" />
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="23544000" />
</task>
<task id="LOCAL-00287" summary="我的钱包">
<created>1573195869075</created>
<option name="number" value="00287" />
<option name="presentableId" value="LOCAL-00287" />
<option name="project" value="LOCAL" />
<updated>1573195869075</updated>
</task>
<task id="LOCAL-00288" summary="我的钱包">
<created>1573196199252</created>
<option name="number" value="00288" />
<option name="presentableId" value="LOCAL-00288" />
<option name="project" value="LOCAL" />
<updated>1573196199252</updated>
<workItem from="1573174620844" duration="24301000" />
</task>
<task id="LOCAL-00289" summary="我的钱包">
<created>1573197359638</created>
... ... @@ -761,11 +745,25 @@
<option name="project" value="LOCAL" />
<updated>1573203723100</updated>
</task>
<option name="localTasksCounter" value="336" />
<task id="LOCAL-00336" summary="我的钱包">
<created>1573205496935</created>
<option name="number" value="00336" />
<option name="presentableId" value="LOCAL-00336" />
<option name="project" value="LOCAL" />
<updated>1573205496935</updated>
</task>
<task id="LOCAL-00337" summary="我的钱包">
<created>1573205554859</created>
<option name="number" value="00337" />
<option name="presentableId" value="LOCAL-00337" />
<option name="project" value="LOCAL" />
<updated>1573205554859</updated>
</task>
<option name="localTasksCounter" value="338" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="364636000" />
<option name="totallyTimeSpent" value="365393000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1154,41 +1152,41 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11">
<caret line="23" column="64" selection-start-line="23" selection-start-column="64" selection-end-line="23" selection-end-column="64" />
<state relative-caret-position="408">
<caret line="29" column="36" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="657">
<caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
<state relative-caret-position="51">
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="29" column="36" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="544">
<caret line="90" column="60" lean-forward="true" selection-start-line="90" selection-start-column="60" selection-end-line="90" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="56" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
<state relative-caret-position="11">
<caret line="23" column="64" selection-start-line="23" selection-start-column="64" selection-end-line="23" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
<state relative-caret-position="119">
<caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
</state>
</provider>
</entry>
... ...
... ... @@ -6,6 +6,7 @@
<style>
img{
max-width: 100% !important;
height: auto;
}
</style>
... ...