王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 7f677e55f7d2c9a6c449bbbec3d8ea2f595ecc73 1 个父辈 542f1059
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 3 个修改的文件 包含 45 行增加 和 44 行删除
... ... @@ -7,6 +7,7 @@
<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" />
... ... @@ -43,20 +44,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
<state relative-caret-position="391">
<caret line="41" column="46" selection-start-line="41" selection-start-column="46" selection-end-line="41" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="entry.css" pinned="false" current-in-tab="false">
<file leaf-file-name="entry.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1037">
<caret line="61" column="13" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" />
<state relative-caret-position="578">
<caret line="46" column="15" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="15" />
</state>
</provider>
</entry>
... ... @@ -64,8 +65,8 @@
<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="164">
<caret line="126" column="8" selection-start-line="126" selection-start-column="1" selection-end-line="126" selection-end-column="8" />
<state relative-caret-position="657">
<caret line="74" column="9" selection-start-line="74" selection-start-column="1" selection-end-line="74" selection-end-column="9" />
</state>
</provider>
</entry>
... ... @@ -201,8 +202,8 @@
<option value="$PROJECT_DIR$/application/home/controller/Member.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$/public/assets/advertising/css/entry.css" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />
</list>
</option>
</component>
... ... @@ -433,28 +434,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="5964000" />
</task>
<task id="LOCAL-00394" summary="我的分享">
<created>1573211040562</created>
<option name="number" value="00394" />
<option name="presentableId" value="LOCAL-00394" />
<option name="project" value="LOCAL" />
<updated>1573211040562</updated>
</task>
<task id="LOCAL-00395" summary="我的分享">
<created>1573211066172</created>
<option name="number" value="00395" />
<option name="presentableId" value="LOCAL-00395" />
<option name="project" value="LOCAL" />
<updated>1573211066172</updated>
</task>
<task id="LOCAL-00396" summary="我的分享">
<created>1573211091157</created>
<option name="number" value="00396" />
<option name="presentableId" value="LOCAL-00396" />
<option name="project" value="LOCAL" />
<updated>1573211091157</updated>
<workItem from="1573259331081" duration="6261000" />
</task>
<task id="LOCAL-00397" summary="我的分享">
<created>1573211119461</created>
... ... @@ -778,11 +758,32 @@
<option name="project" value="LOCAL" />
<updated>1573265763020</updated>
</task>
<option name="localTasksCounter" value="443" />
<task id="LOCAL-00443" summary="商户申请">
<created>1573265829709</created>
<option name="number" value="00443" />
<option name="presentableId" value="LOCAL-00443" />
<option name="project" value="LOCAL" />
<updated>1573265829709</updated>
</task>
<task id="LOCAL-00444" summary="商户申请">
<created>1573265867614</created>
<option name="number" value="00444" />
<option name="presentableId" value="LOCAL-00444" />
<option name="project" value="LOCAL" />
<updated>1573265867614</updated>
</task>
<task id="LOCAL-00445" summary="商户申请">
<created>1573265954868</created>
<option name="number" value="00445" />
<option name="presentableId" value="LOCAL-00445" />
<option name="project" value="LOCAL" />
<updated>1573265954868</updated>
</task>
<option name="localTasksCounter" value="446" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="379637000" />
<option name="totallyTimeSpent" value="379934000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1185,22 +1186,22 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="126" column="8" selection-start-line="126" selection-start-column="1" selection-end-line="126" selection-end-column="8" />
<state relative-caret-position="657">
<caret line="74" column="9" selection-start-line="74" selection-start-column="1" selection-end-line="74" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1037">
<caret line="61" column="13" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" />
<state relative-caret-position="391">
<caret line="41" column="46" selection-start-line="41" selection-start-column="46" selection-end-line="41" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="13" column="31" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
<state relative-caret-position="578">
<caret line="46" column="15" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="15" />
</state>
</provider>
</entry>
... ...
... ... @@ -39,7 +39,7 @@
<div class="submit_title">简介</div>
<textarea name="" id="brief" cols="30" rows="5" placeholder="请填写商家简介">{$data.brief}</textarea>
</div>
<div class="submit_single layout flex_row">
<div class="submit_single clearfix">
<div class="submit_title">
营业执照<i>*</i>
</div>
... ...
... ... @@ -30,6 +30,7 @@
margin-right: 0.26rem;
font-size: 0.28rem;
color: #06121E;
float: left;
}
.submit_title i {
... ... @@ -41,10 +42,9 @@
}
.submit_img {
/*width: 1.8rem;*/
/*height: 1.8rem;*/
position: relative;
border-radius: 0.08rem;
float: left;
}
.submited_img {
... ...