王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 2ea493233c1b08e862e4f5935e11433e03c17f89 1 个父辈 95b7e086
1 个管道 的构建 通过 耗费 1 秒

我的分享

内嵌 并排对比
正在显示 2 个修改的文件 包含 88 行增加 和 59 行删除
... ... @@ -5,9 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/application/home/view/merchant/audit_status.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/enter_view.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -44,11 +43,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
<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="510">
<caret line="78" column="4" lean-forward="true" selection-start-line="78" selection-start-column="4" selection-end-line="78" selection-end-column="32" />
<state relative-caret-position="153">
<caret line="39" column="64" selection-start-line="39" selection-start-column="64" selection-end-line="39" selection-end-column="64" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="public.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351">
<caret line="170" column="10" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="10" />
</state>
</provider>
</entry>
... ... @@ -65,8 +73,8 @@
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="827">
<caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
<state relative-caret-position="708">
<caret line="80" column="36" selection-start-line="80" selection-start-column="36" selection-end-line="80" selection-end-column="36" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
... ... @@ -74,7 +82,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="audit_status.html" pinned="false" current-in-tab="true">
<file leaf-file-name="audit_status.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
... ... @@ -183,9 +191,9 @@
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
</list>
</option>
</component>
... ... @@ -319,6 +327,27 @@
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -395,28 +424,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="4133000" />
</task>
<task id="LOCAL-00383" summary="我的分享">
<created>1573210555775</created>
<option name="number" value="00383" />
<option name="presentableId" value="LOCAL-00383" />
<option name="project" value="LOCAL" />
<updated>1573210555775</updated>
</task>
<task id="LOCAL-00384" summary="我的分享">
<created>1573210604209</created>
<option name="number" value="00384" />
<option name="presentableId" value="LOCAL-00384" />
<option name="project" value="LOCAL" />
<updated>1573210604209</updated>
</task>
<task id="LOCAL-00385" summary="我的分享">
<created>1573210655460</created>
<option name="number" value="00385" />
<option name="presentableId" value="LOCAL-00385" />
<option name="project" value="LOCAL" />
<updated>1573210655460</updated>
<workItem from="1573259331081" duration="4822000" />
</task>
<task id="LOCAL-00386" summary="我的分享">
<created>1573210706934</created>
... ... @@ -740,11 +748,32 @@
<option name="project" value="LOCAL" />
<updated>1573262872433</updated>
</task>
<option name="localTasksCounter" value="432" />
<task id="LOCAL-00432" summary="我的分享">
<created>1573263989729</created>
<option name="number" value="00432" />
<option name="presentableId" value="LOCAL-00432" />
<option name="project" value="LOCAL" />
<updated>1573263989729</updated>
</task>
<task id="LOCAL-00433" summary="我的分享">
<created>1573264204448</created>
<option name="number" value="00433" />
<option name="presentableId" value="LOCAL-00433" />
<option name="project" value="LOCAL" />
<updated>1573264204448</updated>
</task>
<task id="LOCAL-00434" summary="我的分享">
<created>1573264294463</created>
<option name="number" value="00434" />
<option name="presentableId" value="LOCAL-00434" />
<option name="project" value="LOCAL" />
<updated>1573264294463</updated>
</task>
<option name="localTasksCounter" value="435" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="377806000" />
<option name="totallyTimeSpent" value="378495000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -985,13 +1014,6 @@
</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/my_withdraw.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
... ... @@ -1141,17 +1163,10 @@
</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="510">
<caret line="78" column="4" lean-forward="true" selection-start-line="78" selection-start-column="4" selection-end-line="78" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="827">
<caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
<state relative-caret-position="708">
<caret line="80" column="36" selection-start-line="80" selection-start-column="36" selection-end-line="80" selection-end-column="36" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
... ... @@ -1165,6 +1180,20 @@
</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="351">
<caret line="170" column="10" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="10" />
</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="153">
<caret line="39" column="64" selection-start-line="39" selection-start-column="64" selection-end-line="39" selection-end-column="64" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -37,15 +37,15 @@
<div class="submit_title">
营业执照<i>*</i>
</div>
<div class="submit_img">
<div class="submit_img_add upload_one">
<img src="__CDN__/assets/advertising/img/add.png" alt="">
</div>
<div class="submit_img layout flex_row flex_wrap">
{foreach name="$data.business_images" item="b_i"}
<div class="submit_img_add">
<div class="images">
<img src="{$b_i}"/>
</div>
{/foreach}
<div class="submit_img_add upload_one">
<img src="__CDN__/assets/advertising/img/add.png" alt="">
</div>
<!-- <div class="submited_img">
<img src="" alt="" id="img1">
</div>
... ... @@ -57,14 +57,14 @@
其他证件
</div>
<div class="submit_img">
<div class="submit_img_add upload_two">
<img src="__CDN__/assets/advertising/img/add.png" alt="">
</div>
{foreach name="$data.other_images" item="o_i"}
<div class="submit_img_add">
<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>
<!-- <input type="file" class="submit_img_input" onchange="fileImgOther"> -->
</div>
</div>
... ...