我的分享

王晓刚
.idea/workspace.xml
application/home/controller/Member.php
application/home/view/merchant/enter_view.html
--- a/.idea/workspace.xml
查看文件 @2629d2d
+++ b/.idea/workspace.xml
查看文件 @2629d2d
@@ -5,7 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
-      <change beforePath="$PROJECT_DIR$/application/home/controller/Server.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Server.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" 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" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,95 +35,38 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Member.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="595">
-              <caret line="78" column="38" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="78" selection-end-column="38" />
+            <state relative-caret-position="677">
+              <caret line="380" column="20" selection-start-line="380" selection-start-column="20" selection-end-line="380" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Collect.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
+      <file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="793">
-              <caret line="56" column="9" selection-start-line="56" selection-start-column="9" selection-end-line="56" selection-end-column="9" />
+            <state relative-caret-position="255">
+              <caret line="131" column="38" lean-forward="true" selection-start-line="131" selection-start-column="38" selection-end-line="131" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Share.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="723">
-              <caret line="98" column="60" lean-forward="true" selection-start-line="98" selection-start-column="60" selection-end-line="98" selection-end-column="60" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Server.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="577">
-              <caret line="69" column="66" lean-forward="true" selection-start-line="69" selection-start-column="66" selection-end-line="69" selection-end-column="66" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="725">
-              <caret line="129" column="11" lean-forward="true" selection-start-line="104" selection-start-column="8" selection-end-line="129" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="20" column="61" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="61" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="640">
-              <caret line="89" column="34" selection-start-line="89" selection-start-column="34" selection-end-line="89" selection-end-column="34" />
+            <state relative-caret-position="476">
+              <caret line="43" column="41" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="41" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
+      <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="595">
-              <caret line="40" column="30" selection-start-line="40" selection-start-column="30" selection-end-line="40" selection-end-column="30" />
-              <folding>
-                <element signature="e#129#166#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="130">
-              <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
+            <state relative-caret-position="153">
+              <caret line="17" column="8" lean-forward="true" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="52" />
             </state>
           </provider>
         </entry>
@@ -137,7 +82,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>quest_condition</find>
       <find>submit_btn_sure</find>
       <find>submit_modal</find>
       <find>right_btn</find>
@@ -167,6 +111,7 @@
       <find>btn</find>
       <find>over</find>
       <find>referrer</find>
+      <find>get_city</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -183,7 +128,6 @@
         <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/MerchantAudit.php" />
         <option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
         <option value="$PROJECT_DIR$/application/extra/wechat.php" />
         <option value="$PROJECT_DIR$/application/common/controller/Backend.php" />
@@ -219,16 +163,17 @@
         <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
         <option value="$PROJECT_DIR$/application/home/view/member/earnings_log.html" />
         <option value="$PROJECT_DIR$/application/home/view/member/withdraw_log.html" />
-        <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
         <option value="$PROJECT_DIR$/application/home/view/collect/index.html" />
         <option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
         <option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" />
         <option value="$PROJECT_DIR$/application/home/view/merchant/index.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/share/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/admin/controller/MerchantAudit.php" />
+        <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
+        <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
       </list>
     </option>
   </component>
@@ -320,6 +265,19 @@
               <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
               <item name="advertising" type="462c0819:PsiDirectoryNode" />
               <item name="application" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
+              <item name="admin" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
               <item name="home" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -332,6 +290,21 @@
             <path>
               <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
               <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
+              <item name="home" type="462c0819:PsiDirectoryNode" />
+              <item name="view" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
+              <item name="home" type="462c0819:PsiDirectoryNode" />
+              <item name="view" type="462c0819:PsiDirectoryNode" />
+              <item name="merchant" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
@@ -409,28 +382,8 @@
       <workItem from="1572914713443" duration="29898000" />
       <workItem from="1573000530976" duration="6061000" />
       <workItem from="1573087576825" duration="5555000" />
-      <workItem from="1573174620844" duration="32153000" />
-    </task>
-    <task id="LOCAL-00378" summary="我的分享">
-      <created>1573210363206</created>
-      <option name="number" value="00378" />
-      <option name="presentableId" value="LOCAL-00378" />
-      <option name="project" value="LOCAL" />
-      <updated>1573210363206</updated>
-    </task>
-    <task id="LOCAL-00379" summary="我的分享">
-      <created>1573210388476</created>
-      <option name="number" value="00379" />
-      <option name="presentableId" value="LOCAL-00379" />
-      <option name="project" value="LOCAL" />
-      <updated>1573210388476</updated>
-    </task>
-    <task id="LOCAL-00380" summary="我的分享">
-      <created>1573210450630</created>
-      <option name="number" value="00380" />
-      <option name="presentableId" value="LOCAL-00380" />
-      <option name="project" value="LOCAL" />
-      <updated>1573210450630</updated>
+      <workItem from="1573174620844" duration="32581000" />
+      <workItem from="1573259331081" duration="2482000" />
     </task>
     <task id="LOCAL-00381" summary="我的分享">
       <created>1573210480144</created>
@@ -754,11 +707,32 @@
       <option name="project" value="LOCAL" />
       <updated>1573213984237</updated>
     </task>
-    <option name="localTasksCounter" value="427" />
+    <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>
+    </task>
+    <task id="LOCAL-00429" summary="我的分享">
+      <created>1573214175320</created>
+      <option name="number" value="00429" />
+      <option name="presentableId" value="LOCAL-00429" />
+      <option name="project" value="LOCAL" />
+      <updated>1573214175320</updated>
+    </task>
+    <option name="localTasksCounter" value="430" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="373245000" />
+    <option name="totallyTimeSpent" value="376155000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -772,7 +746,7 @@
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
       <window_info anchor="bottom" id="运行" order="7" />
       <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15245202" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -794,26 +768,26 @@
       <window_info anchor="bottom" id="运行" order="7" />
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Database" order="4" weight="0.32995737" />
       <window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" />
       <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" />
-      <window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="调试" order="13" />
+      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info id="Favorites" order="2" side_tool="true" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -843,13 +817,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="我的分享" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4352">
-          <caret line="279" column="63" selection-start-line="279" selection-start-column="56" selection-end-line="279" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/home/model/User.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
@@ -971,13 +938,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/demo.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="60" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/record.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2261">
@@ -1059,9 +1019,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="51">
           <caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
-          <folding>
-            <element signature="n#style#0;n#html#0;n#!!top" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1096,16 +1053,9 @@
         </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="130">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-        </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="595">
+        <state relative-caret-position="561">
           <caret line="40" column="30" selection-start-line="40" selection-start-column="30" selection-end-line="40" selection-end-column="30" />
           <folding>
             <element signature="e#129#166#0#PHP" expanded="true" />
@@ -1113,72 +1063,93 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
+    <entry file="file://$PROJECT_DIR$/public/bg2.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/bg1.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
+        <state relative-caret-position="1513">
+          <caret line="89" column="34" selection-start-line="89" selection-start-column="34" selection-end-line="89" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
+    <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="793">
-          <caret line="56" column="9" selection-start-line="56" selection-start-column="9" selection-end-line="56" selection-end-column="9" />
+        <state relative-caret-position="340">
+          <caret line="20" column="61" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/bg2.png">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="403">
+          <caret line="137" column="41" selection-start-line="137" selection-start-column="41" selection-end-line="137" selection-end-column="41" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/bg1.png">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="723">
+          <caret line="98" column="60" selection-start-line="98" selection-start-column="60" selection-end-line="98" selection-end-column="60" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
+    <entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="595">
-          <caret line="78" column="38" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="78" selection-end-column="38" />
+        <state relative-caret-position="17">
+          <caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="640">
-          <caret line="89" column="34" selection-start-line="89" selection-start-column="34" selection-end-line="89" selection-end-column="34" />
+        <state relative-caret-position="793">
+          <caret line="56" column="9" selection-start-line="56" selection-start-column="9" selection-end-line="56" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/home/controller/demo.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="17" column="8" lean-forward="true" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="52" />
+        <state relative-caret-position="731">
+          <caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
+    <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="723">
-          <caret line="98" column="60" lean-forward="true" selection-start-line="98" selection-start-column="60" selection-end-line="98" selection-end-column="60" />
+        <state relative-caret-position="375">
+          <caret line="102" column="8" selection-start-line="102" selection-start-column="8" selection-end-line="102" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
+    <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="61" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="61" />
+        <state relative-caret-position="476">
+          <caret line="43" column="41" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="725">
-          <caret line="129" column="11" lean-forward="true" selection-start-line="104" selection-start-column="8" selection-end-line="129" selection-end-column="11" />
+        <state relative-caret-position="153">
+          <caret line="17" column="8" lean-forward="true" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="52" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="131" column="38" lean-forward="true" selection-start-line="131" selection-start-column="38" selection-end-line="131" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="577">
-          <caret line="69" column="66" lean-forward="true" selection-start-line="69" selection-start-column="66" selection-end-line="69" selection-end-column="66" />
+        <state relative-caret-position="677">
+          <caret line="380" column="20" selection-start-line="380" selection-start-column="20" selection-end-line="380" selection-end-column="20" />
         </state>
       </provider>
     </entry>
--- a/application/home/controller/Member.php
查看文件 @2629d2d
+++ b/application/home/controller/Member.php
查看文件 @2629d2d
@@ -358,7 +358,28 @@ class Member extends WechatBase
      * @return mixed
      */
     public function merchant_enter_form(){
+        $domain_name = $this->request->domain();//域名
         $data = Db::name('merchant_audit')->where(['user_id'=>$this->user_id])->find();
+        if(!empty($data)){
+            if($data['status'] == 1){
+                //审核中
+                $this->redirect('audit1');
+            }else if($data['status'] == 2){
+                //审核通过
+                $this->redirect('audit2');
+            }
+            $business_images = explode(',',$data['business_images']);
+            foreach($business_images as $key => $b_i){
+                $business_images[$key] = $domain_name.$b_i;
+            }
+            $data['business_images'] = $business_images;
+
+            $other_images = explode(',',$data['other_images']);
+            foreach($other_images as $key => $o_i){
+                $other_images[$key] = $domain_name.$o_i;
+            }
+            $data['other_images'] = $other_images;
+        }
         $this->assign('user_id',$this->user_id);
         $this->assign('data',$data);
         $this->assign('title','商家入驻');
--- a/application/home/view/merchant/enter_view.html
查看文件 @2629d2d
+++ b/application/home/view/merchant/enter_view.html
查看文件 @2629d2d
@@ -15,23 +15,23 @@
         <div class="submit_table">
             <div class="submit_single align_center layout flex_row">
                 <div class="submit_title">商家名称<i>*</i></div>
-                <input type="text" placeholder="请填写商家名称">
+                <input type="text" id="merchant_title" value="{$data.merchant_title}" placeholder="请填写商家名称">
             </div>
             <div class="submit_single align_center layout flex_row">
                 <div class="submit_title">联系人<i>*</i></div>
-                <input type="text" placeholder="请填写联系人姓名">
+                <input type="text" id="merchant_name" value="{$data.merchant_name}" placeholder="请填写联系人姓名">
             </div>
             <div class="submit_single align_center layout flex_row">
                 <div class="submit_title">联系电话<i>*</i></div>
-                <input type="text" placeholder="请填写联系人电话">
+                <input type="text" id="merchant_mobile" value="{$data.merchant_mobile}" placeholder="请填写联系人电话">
             </div>
             <div class="submit_single align_center layout flex_row">
                 <div class="submit_title">地址</div>
-                <input type="text" placeholder="请填写所在地址">
+                <input type="text" id="area" value="{$data.area}" placeholder="请填写所在地址">
             </div>
             <div class="submit_single  layout flex_row">
                 <div class="submit_title">简介</div>
-                <textarea name="" id="" cols="30" rows="5" placeholder="请填写商家简介"></textarea>
+                <textarea name="" id="brief" cols="30" rows="5" placeholder="请填写商家简介">{$data.brief}</textarea>
             </div>
             <div class="submit_single  layout flex_row">
                 <div class="submit_title">
@@ -41,6 +41,11 @@
                     <div class="submit_img_add">
                         <img src="__CDN__/assets/advertising/img/add.png" alt="">
                     </div>
+                    {foreach name="$data.business_images" item="b_i"}
+                    <div class="submit_img">
+                        <img src="{$b_i}"/>
+                    </div>
+                    {/foreach}
                     <!-- <div class="submited_img">
                         <img src="" alt="" id="img1">
                     </div>
@@ -55,6 +60,11 @@
                     <div class="submit_img_add">
                         <img src="__CDN__/assets/advertising/img/add.png" alt="">
                     </div>
+                    {foreach name="$data.other_images" item="o_i"}
+                    <div class="submit_img">
+                        <img src="{$o_i}"/>
+                    </div>
+                    {/foreach}
                     <!-- <input type="file" class="submit_img_input" onchange="fileImgOther"> -->
                 </div>
             </div>