王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 54462a28d73e05514d7d962f1941601c404bc14e 1 个父辈 67643022
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 35 行增加 和 40 行删除
... ... @@ -5,8 +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/controller/Merchant.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,20 +33,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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">
<file leaf-file-name="audit_status.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="107" column="57" selection-start-line="107" selection-start-column="45" selection-end-line="107" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="52" column="54" selection-start-line="52" selection-start-column="54" selection-end-line="52" selection-end-column="54" />
<state relative-caret-position="538">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
</state>
</provider>
</entry>
... ... @@ -127,7 +117,6 @@
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
<option value="$PROJECT_DIR$/application/home/view/collect/index.html" />
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
... ... @@ -155,6 +144,7 @@
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
<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" />
</list>
</option>
</component>
... ... @@ -372,14 +362,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="12679000" />
</task>
<task id="LOCAL-00538" summary=" 商户申请">
<created>1573292821346</created>
<option name="number" value="00538" />
<option name="presentableId" value="LOCAL-00538" />
<option name="project" value="LOCAL" />
<updated>1573292821346</updated>
<workItem from="1573519427130" duration="12973000" />
</task>
<task id="LOCAL-00539" summary=" 商户申请">
<created>1573292848558</created>
... ... @@ -717,11 +700,18 @@
<option name="project" value="LOCAL" />
<updated>1573543777045</updated>
</task>
<option name="localTasksCounter" value="587" />
<task id="LOCAL-00587" summary=" 商户申请">
<created>1573544083647</created>
<option name="number" value="00587" />
<option name="presentableId" value="LOCAL-00587" />
<option name="project" value="LOCAL" />
<updated>1573544083647</updated>
</task>
<option name="localTasksCounter" value="588" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="418986000" />
<option name="totallyTimeSpent" value="419280000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -836,13 +826,6 @@
</state>
</provider>
</entry>
<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">
<caret line="44" column="18" lean-forward="true" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
</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="657">
... ... @@ -1103,17 +1086,24 @@
</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="527">
<caret line="53" column="13" lean-forward="true" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
</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="459">
<caret line="107" column="57" selection-start-line="107" selection-start-column="45" selection-end-line="107" selection-end-column="57" />
<state relative-caret-position="1836">
<caret line="161" column="62" lean-forward="true" selection-start-line="161" selection-start-column="62" selection-end-line="161" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="52" column="54" selection-start-line="52" selection-start-column="54" selection-end-line="52" selection-end-column="54" />
<state relative-caret-position="538">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
</state>
</provider>
</entry>
... ...
... ... @@ -31,6 +31,11 @@
text-align: center;
font-size: 0.24rem;
}
.txt{
font-size:32px;
font-weight:500;
color:rgba(255,255,255,1);
}
</style>
<body>
... ... @@ -39,10 +44,10 @@
<div class="examin_type">
{if condition="$data.status eq 1"}
<img src="__CDN__/assets/advertising/img/examin.png" alt="" class="examin_img">
<div>审核中！</div>
<div class="txt">审核中！</div>
{elseif condition="$data.status eq 2"}
<img src="__CDN__/assets/advertising/img/examin1.png" alt="" class="examin_img">
<div>审核通过！</div>
<div class="txt">审核通过！</div>
{/if}
</div>
</div>
... ...