商户申请

王晓刚
.idea/workspace.xml
application/home/view/merchant/enter_view.html
--- a/.idea/workspace.xml
查看文件 @65b6d1f
+++ b/.idea/workspace.xml
查看文件 @65b6d1f
@@ -46,8 +46,17 @@
       <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="204">
-              <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+            <state relative-caret-position="289">
+              <caret line="44" column="65" selection-start-line="44" selection-start-column="65" selection-end-line="44" selection-end-column="65" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="entry.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="697">
+              <caret line="62" column="27" selection-start-line="62" selection-start-column="27" selection-end-line="62" selection-end-column="27" />
             </state>
           </provider>
         </entry>
@@ -55,8 +64,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="351">
-              <caret line="170" column="10" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="10" />
+            <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>
           </provider>
         </entry>
@@ -143,7 +152,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/public/assets/js/backend/user_exp_log_audit.js" />
         <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" />
@@ -193,6 +201,7 @@
         <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" />
       </list>
     </option>
@@ -424,28 +433,7 @@
       <workItem from="1573000530976" duration="6061000" />
       <workItem from="1573087576825" duration="5555000" />
       <workItem from="1573174620844" duration="32581000" />
-      <workItem from="1573259331081" duration="5225000" />
-    </task>
-    <task id="LOCAL-00388" summary="我的分享">
-      <created>1573210848714</created>
-      <option name="number" value="00388" />
-      <option name="presentableId" value="LOCAL-00388" />
-      <option name="project" value="LOCAL" />
-      <updated>1573210848714</updated>
-    </task>
-    <task id="LOCAL-00389" summary="我的分享">
-      <created>1573210887915</created>
-      <option name="number" value="00389" />
-      <option name="presentableId" value="LOCAL-00389" />
-      <option name="project" value="LOCAL" />
-      <updated>1573210887915</updated>
-    </task>
-    <task id="LOCAL-00390" summary="我的分享">
-      <created>1573210932006</created>
-      <option name="number" value="00390" />
-      <option name="presentableId" value="LOCAL-00390" />
-      <option name="project" value="LOCAL" />
-      <updated>1573210932006</updated>
+      <workItem from="1573259331081" duration="5381000" />
     </task>
     <task id="LOCAL-00391" summary="我的分享">
       <created>1573210957540</created>
@@ -769,11 +757,32 @@
       <option name="project" value="LOCAL" />
       <updated>1573264812828</updated>
     </task>
-    <option name="localTasksCounter" value="437" />
+    <task id="LOCAL-00437" summary="商户申请">
+      <created>1573265098591</created>
+      <option name="number" value="00437" />
+      <option name="presentableId" value="LOCAL-00437" />
+      <option name="project" value="LOCAL" />
+      <updated>1573265098591</updated>
+    </task>
+    <task id="LOCAL-00438" summary="商户申请">
+      <created>1573265155637</created>
+      <option name="number" value="00438" />
+      <option name="presentableId" value="LOCAL-00438" />
+      <option name="project" value="LOCAL" />
+      <updated>1573265155637</updated>
+    </task>
+    <task id="LOCAL-00439" summary="商户申请">
+      <created>1573265187852</created>
+      <option name="number" value="00439" />
+      <option name="presentableId" value="LOCAL-00439" />
+      <option name="project" value="LOCAL" />
+      <updated>1573265187852</updated>
+    </task>
+    <option name="localTasksCounter" value="440" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="378898000" />
+    <option name="totallyTimeSpent" value="379054000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -855,16 +864,10 @@
     <MESSAGE value="音频" />
     <MESSAGE value="我的钱包" />
     <MESSAGE value="我的分享" />
-    <option name="LAST_COMMIT_MESSAGE" value="我的分享" />
+    <MESSAGE value="商户申请" />
+    <option name="LAST_COMMIT_MESSAGE" value="商户申请" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/public/assets/advertising/js/toast.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="850">
-          <caret line="50" column="22" lean-forward="true" selection-start-line="50" selection-start-column="22" selection-end-line="50" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2465">
@@ -1180,17 +1183,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/entry.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="697">
+          <caret line="62" column="27" selection-start-line="62" selection-start-column="27" selection-end-line="62" selection-end-column="27" />
+        </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="351">
-          <caret line="170" column="10" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="10" />
+        <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>
       </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="204">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+        <state relative-caret-position="289">
+          <caret line="44" column="65" selection-start-line="44" selection-start-column="65" selection-end-line="44" selection-end-column="65" />
         </state>
       </provider>
     </entry>
--- a/application/home/view/merchant/enter_view.html
查看文件 @65b6d1f
+++ b/application/home/view/merchant/enter_view.html
查看文件 @65b6d1f
@@ -42,7 +42,7 @@
                     营业执照<i>*</i>
                 </div>
                 <div class="submit_img ">
-                    <div class="layout flex_row flex_wrap justify_around">
+                    <div class="layout flex_row flex_wrap justify">
                         {foreach name="$data.business_images" item="b_i"}
                         <div class="images">
                             <img src="{$b_i}"/>