王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 d5c3c720b30e2c32301dbadf0a8642fb528d0e9f 1 个父辈 8d3317a9
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 42 行增加 和 46 行删除
... ... @@ -7,7 +7,6 @@
<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$/application/home/view/merchant/enter_view.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -47,8 +46,8 @@
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<state relative-caret-position="578">
<caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
</state>
</provider>
</entry>
... ... @@ -57,7 +56,7 @@
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697">
<caret line="65" column="4" lean-forward="true" selection-start-line="65" selection-start-column="4" selection-end-line="65" selection-end-column="21" />
<caret line="65" selection-start-line="65" selection-end-line="66" />
</state>
</provider>
</entry>
... ... @@ -327,14 +326,6 @@
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="merchant" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -434,28 +425,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="6569000" />
</task>
<task id="LOCAL-00399" summary="我的分享">
<created>1573211196026</created>
<option name="number" value="00399" />
<option name="presentableId" value="LOCAL-00399" />
<option name="project" value="LOCAL" />
<updated>1573211196026</updated>
</task>
<task id="LOCAL-00400" summary="我的分享">
<created>1573211226975</created>
<option name="number" value="00400" />
<option name="presentableId" value="LOCAL-00400" />
<option name="project" value="LOCAL" />
<updated>1573211226975</updated>
</task>
<task id="LOCAL-00401" summary="我的分享">
<created>1573211257750</created>
<option name="number" value="00401" />
<option name="presentableId" value="LOCAL-00401" />
<option name="project" value="LOCAL" />
<updated>1573211257750</updated>
<workItem from="1573259331081" duration="7301000" />
</task>
<task id="LOCAL-00402" summary="我的分享">
<created>1573211312227</created>
... ... @@ -779,11 +749,32 @@
<option name="project" value="LOCAL" />
<updated>1573266333164</updated>
</task>
<option name="localTasksCounter" value="448" />
<task id="LOCAL-00448" summary="商户申请">
<created>1573266430221</created>
<option name="number" value="00448" />
<option name="presentableId" value="LOCAL-00448" />
<option name="project" value="LOCAL" />
<updated>1573266430222</updated>
</task>
<task id="LOCAL-00449" summary="商户申请">
<created>1573266487921</created>
<option name="number" value="00449" />
<option name="presentableId" value="LOCAL-00449" />
<option name="project" value="LOCAL" />
<updated>1573266487921</updated>
</task>
<task id="LOCAL-00450" summary="商户申请">
<created>1573266508358</created>
<option name="number" value="00450" />
<option name="presentableId" value="LOCAL-00450" />
<option name="project" value="LOCAL" />
<updated>1573266508358</updated>
</task>
<option name="localTasksCounter" value="451" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="380242000" />
<option name="totallyTimeSpent" value="380974000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1194,14 +1185,14 @@
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="697">
<caret line="65" column="4" lean-forward="true" selection-start-line="65" selection-start-column="4" selection-end-line="65" selection-end-column="21" />
<caret line="65" selection-start-line="65" selection-end-line="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<state relative-caret-position="578">
<caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
</state>
</provider>
</entry>
... ...
... ... @@ -68,13 +68,18 @@
其他证件
</div>
<div class="submit_img">
{foreach name="$data.other_images" item="o_i"}
<div class="images">
<img src="{$o_i}"/>
</div>
{/foreach}
<div class="submit_img_add upload_two">
<img src="__CDN__/assets/advertising/img/add.png" alt="">
<div class="clearfix">
{foreach name="$data.other_images" item="o_i"}
<div class="images">
<img src="{$o_i}"/>
</div>
<div class="images">
<img src="{$o_i}"/>
</div>
{/foreach}
<div class="submit_img_add upload_one">
<img src="__CDN__/assets/advertising/img/add.png" alt="">
</div>
</div>
<!-- <input type="file" class="submit_img_input" onchange="fileImgOther"> -->
</div>
... ...