王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 3cb0b488b2bf9e152715e977030c4230c6d411a4 1 个父辈 cdd4a6a7
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 33 行增加 和 22 行删除
... ... @@ -5,6 +5,7 @@
</component>
<component name="ChangeListManager">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -57,8 +58,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="697">
<caret line="107" column="96" selection-start-line="107" selection-start-column="96" selection-end-line="107" selection-end-column="96" />
<state relative-caret-position="629">
<caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
<folding>
<element signature="e#2807#3332#0" />
<element signature="e#4045#4570#0" />
... ... @@ -144,7 +145,7 @@
<find>btn_more</find>
<find>detail_qust</find>
<find>detail_top</find>
<find />
<find>{if condition='$data.is_correct eq 0 &amp;&amp; $data.is_answer eq 1'}</find>
<find>targetSdkVersion</find>
<find>showErr</find>
<find>checkMore</find>
... ... @@ -462,21 +463,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="16338000" />
</task>
<task id="LOCAL-00427" summary="我的分享">
<created>1573214043637</created>
<option name="number" value="00427" />
<option name="presentableId" value="LOCAL-00427" />
<option name="project" value="LOCAL" />
<updated>1573214043637</updated>
</task>
<task id="LOCAL-00428" summary="我的分享">
<created>1573214105893</created>
<option name="number" value="00428" />
<option name="presentableId" value="LOCAL-00428" />
<option name="project" value="LOCAL" />
<updated>1573214105893</updated>
<workItem from="1573259331081" duration="17062000" />
</task>
<task id="LOCAL-00429" summary="我的分享">
<created>1573214175320</created>
... ... @@ -807,11 +794,25 @@
<option name="project" value="LOCAL" />
<updated>1573278290777</updated>
</task>
<option name="localTasksCounter" value="476" />
<task id="LOCAL-00476" summary="商户申请">
<created>1573279351012</created>
<option name="number" value="00476" />
<option name="presentableId" value="LOCAL-00476" />
<option name="project" value="LOCAL" />
<updated>1573279351012</updated>
</task>
<task id="LOCAL-00477" summary="商户申请">
<created>1573279589367</created>
<option name="number" value="00477" />
<option name="presentableId" value="LOCAL-00477" />
<option name="project" value="LOCAL" />
<updated>1573279589367</updated>
</task>
<option name="localTasksCounter" value="478" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="390011000" />
<option name="totallyTimeSpent" value="390735000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1224,8 +1225,8 @@
</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="697">
<caret line="107" column="96" selection-start-line="107" selection-start-column="96" selection-end-line="107" selection-end-column="96" />
<state relative-caret-position="629">
<caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
<folding>
<element signature="e#2807#3332#0" />
<element signature="e#4045#4570#0" />
... ...
... ... @@ -30,10 +30,20 @@
background-color: #BDC4CE !important;
pointer-events: none;
}
.hint{
width: 100%;
height: 0.4rem;
font-size: 0.4rem;
position: fixed;
background: #FB7B19;
}
</style>
<body>
<div class="submit_entry">
{if condition='$data.status eq 3 && $data.expiration_time > time()'}
<div class="hint">温馨提示:您的申请审核失败,请于{:date('Y-m-d H:i',$data['expiration_time'])}之后再次提交申请！</div>
{/if}
<div class="submit_table">
<div class="submit_single align_center layout flex_row">
<div class="submit_title">商家名称<i>*</i></div>
... ...