商户申请

王晓刚
.idea/workspace.xml
public/assets/advertising/css/index.css
--- a/.idea/workspace.xml
查看文件 @9a39695
+++ b/.idea/workspace.xml
查看文件 @9a39695
@@ -5,7 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
-       <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" />
+       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,11 +33,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-       <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="249">
-               <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
+             <state relative-caret-position="555">
+               <caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
+             </state>
+           </provider>
+         </entry>
+       </file>
+       <file leaf-file-name="index.css" pinned="false" current-in-tab="true">
+         <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
+           <provider selected="true" editor-type-id="text-editor">
+             <state relative-caret-position="477">
+               <caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -283,6 +292,21 @@
               <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>
@@ -362,28 +386,7 @@
       <workItem from="1573174620844" duration="32581000" />
       <workItem from="1573259331081" duration="30435000" />
       <workItem from="1573432217070" duration="2199000" />
-       <workItem from="1573519427130" duration="13160000" />
-     </task>
-     <task id="LOCAL-00541" summary="    商户申请">
-       <created>1573292930415</created>
-       <option name="number" value="00541" />
-       <option name="presentableId" value="LOCAL-00541" />
-       <option name="project" value="LOCAL" />
-       <updated>1573292930415</updated>
-     </task>
-     <task id="LOCAL-00542" summary="    商户申请">
-       <created>1573293077920</created>
-       <option name="number" value="00542" />
-       <option name="presentableId" value="LOCAL-00542" />
-       <option name="project" value="LOCAL" />
-       <updated>1573293077920</updated>
-     </task>
-     <task id="LOCAL-00543" summary="    商户申请">
-       <created>1573293108543</created>
-       <option name="number" value="00543" />
-       <option name="presentableId" value="LOCAL-00543" />
-       <option name="project" value="LOCAL" />
-       <updated>1573293108543</updated>
+       <workItem from="1573519427130" duration="13747000" />
     </task>
     <task id="LOCAL-00544" summary="    商户申请">
       <created>1573294162462</created>
@@ -707,11 +710,32 @@
       <option name="project" value="LOCAL" />
       <updated>1573544443709</updated>
     </task>
-     <option name="localTasksCounter" value="590" />
+     <task id="LOCAL-00590" summary="    商户申请">
+       <created>1573544544023</created>
+       <option name="number" value="00590" />
+       <option name="presentableId" value="LOCAL-00590" />
+       <option name="project" value="LOCAL" />
+       <updated>1573544544023</updated>
+     </task>
+     <task id="LOCAL-00591" summary="    商户申请">
+       <created>1573544613067</created>
+       <option name="number" value="00591" />
+       <option name="presentableId" value="LOCAL-00591" />
+       <option name="project" value="LOCAL" />
+       <updated>1573544613067</updated>
+     </task>
+     <task id="LOCAL-00592" summary="    商户申请">
+       <created>1573544641437</created>
+       <option name="number" value="00592" />
+       <option name="presentableId" value="LOCAL-00592" />
+       <option name="project" value="LOCAL" />
+       <updated>1573544641437</updated>
+     </task>
+     <option name="localTasksCounter" value="593" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-     <option name="totallyTimeSpent" value="419467000" />
+     <option name="totallyTimeSpent" value="420054000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -924,13 +948,6 @@
         </state>
       </provider>
     </entry>
-     <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
-       <provider selected="true" editor-type-id="text-editor">
-         <state relative-caret-position="470">
-           <caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
-         </state>
-       </provider>
-     </entry>
     <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1241">
@@ -1102,8 +1119,15 @@
     </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="249">
-           <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
+         <state relative-caret-position="555">
+           <caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
+         </state>
+       </provider>
+     </entry>
+     <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
+       <provider selected="true" editor-type-id="text-editor">
+         <state relative-caret-position="477">
+           <caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
         </state>
       </provider>
     </entry>
--- a/public/assets/advertising/css/index.css
查看文件 @9a39695
+++ b/public/assets/advertising/css/index.css
查看文件 @9a39695
@@ -19,7 +19,7 @@
 
 .content_list {
     padding: 0.34rem;
-     margin-top: 0.88rem;
+     margin-top: 1rem;
 }
 
 .content_single {