王晓刚 / advertising · 提交

转到一个项目

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

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 43 行增加 和 25 行删除
... ... @@ -4,7 +4,9 @@
<bookmark url="file://$PROJECT_DIR$/application/home/view/member/my_information.html" line="118" mnemonic="4" />
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="" />
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -49,11 +51,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<state relative-caret-position="510">
<caret line="30" column="18" lean-forward="true" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="swiper.min.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="234" column="23" selection-start-line="234" selection-start-column="23" selection-end-line="234" selection-end-column="23" />
</state>
</provider>
</entry>
... ... @@ -110,7 +121,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
... ... @@ -161,6 +171,7 @@
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css" />
</list>
</option>
</component>
... ... @@ -347,6 +358,14 @@
<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>
... ... @@ -423,14 +442,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="20215000" />
</task>
<task id="LOCAL-00452" summary="商户申请">
<created>1573268028663</created>
<option name="number" value="00452" />
<option name="presentableId" value="LOCAL-00452" />
<option name="project" value="LOCAL" />
<updated>1573268028663</updated>
<workItem from="1573259331081" duration="20488000" />
</task>
<task id="LOCAL-00453" summary="商户申请">
<created>1573268142806</created>
... ... @@ -768,11 +780,18 @@
<option name="project" value="LOCAL" />
<updated>1573283462761</updated>
</task>
<option name="localTasksCounter" value="501" />
<task id="LOCAL-00501" summary="商户申请">
<created>1573283491110</created>
<option name="number" value="00501" />
<option name="presentableId" value="LOCAL-00501" />
<option name="project" value="LOCAL" />
<updated>1573283491110</updated>
</task>
<option name="localTasksCounter" value="502" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="393888000" />
<option name="totallyTimeSpent" value="394161000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -858,13 +877,6 @@
<option name="LAST_COMMIT_MESSAGE" value="商户申请" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
... ... @@ -1169,8 +1181,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<state relative-caret-position="510">
<caret line="30" column="18" lean-forward="true" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="234" column="23" selection-start-line="234" selection-start-column="23" selection-end-line="234" selection-end-column="23" />
</state>
</provider>
</entry>
... ...
... ... @@ -231,7 +231,6 @@
}
function error(err) {
alert(JSON.stringify(err))
toast('定位失败');
};
//倒计时赋值
... ...