商户申请

王晓刚
.idea/workspace.xml
application/admin/controller/MerchantGoods.php
--- a/.idea/workspace.xml
查看文件 @2c1ad37
+++ b/.idea/workspace.xml
查看文件 @2c1ad37
@@ -6,7 +6,6 @@
   <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/admin/controller/MerchantAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -43,15 +42,36 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="true">
+      <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="629">
+            <state relative-caret-position="1037">
               <caret line="147" column="62" selection-start-line="147" selection-start-column="62" selection-end-line="147" selection-end-column="62" />
             </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="443">
+              <caret line="113" column="42" selection-start-line="113" selection-start-column="42" selection-end-line="113" selection-end-column="42" />
+            </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="444">
+              <caret line="111" column="49" selection-start-line="111" selection-start-column="40" selection-end-line="111" selection-end-column="49" />
+              <folding>
+                <element signature="e#5425#10699#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <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">
@@ -101,27 +121,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/admin/model/UserExpLogAudit.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="15" column="35" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="video_detail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4182">
-              <caret line="246" column="21" selection-start-line="246" selection-start-column="21" selection-end-line="246" selection-end-column="21" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -133,7 +132,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>right_btn</find>
       <find>newTimer</find>
       <find>choice_ans</find>
       <find>#D12324</find>
@@ -163,6 +161,7 @@
       <find>distance_where</find>
       <find>quest_box</find>
       <find>alert</find>
+      <find>business_images</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -201,12 +200,10 @@
         <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/Merchant.php" />
         <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" />
         <option value="$PROJECT_DIR$/application/home/view/share/index.html" />
-        <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
         <option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />
         <option value="$PROJECT_DIR$/application/home/view/member/index.html" />
         <option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
@@ -225,6 +222,8 @@
         <option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
         <option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].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/Merchant.php" />
       </list>
     </option>
   </component>
@@ -315,42 +314,6 @@
               <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="admin" 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="admin" type="462c0819:PsiDirectoryNode" />
-              <item name="view" type="462c0819:PsiDirectoryNode" />
-              <item name="user_exp_log_audit" 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="view" type="462c0819:PsiDirectoryNode" />
-              <item name="user_money_log_audit" 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>
@@ -520,21 +483,7 @@
       <workItem from="1573174620844" duration="32581000" />
       <workItem from="1573259331081" duration="30435000" />
       <workItem from="1573432217070" duration="2199000" />
-      <workItem from="1573519427130" duration="1226000" />
-    </task>
-    <task id="LOCAL-00497" summary="商户申请">
-      <created>1573283250525</created>
-      <option name="number" value="00497" />
-      <option name="presentableId" value="LOCAL-00497" />
-      <option name="project" value="LOCAL" />
-      <updated>1573283250525</updated>
-    </task>
-    <task id="LOCAL-00498" summary="商户申请">
-      <created>1573283279027</created>
-      <option name="number" value="00498" />
-      <option name="presentableId" value="LOCAL-00498" />
-      <option name="project" value="LOCAL" />
-      <updated>1573283279027</updated>
+      <workItem from="1573519427130" duration="3109000" />
     </task>
     <task id="LOCAL-00499" summary="商户申请">
       <created>1573283388103</created>
@@ -865,11 +814,25 @@
       <option name="project" value="LOCAL" />
       <updated>1573294224448</updated>
     </task>
-    <option name="localTasksCounter" value="546" />
+    <task id="LOCAL-00546" summary="    商户申请">
+      <created>1573521445217</created>
+      <option name="number" value="00546" />
+      <option name="presentableId" value="LOCAL-00546" />
+      <option name="project" value="LOCAL" />
+      <updated>1573521445217</updated>
+    </task>
+    <task id="LOCAL-00547" summary="    商户申请">
+      <created>1573522719090</created>
+      <option name="number" value="00547" />
+      <option name="presentableId" value="LOCAL-00547" />
+      <option name="project" value="LOCAL" />
+      <updated>1573522719090</updated>
+    </task>
+    <option name="localTasksCounter" value="548" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="407533000" />
+    <option name="totallyTimeSpent" value="409416000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1038,13 +1001,6 @@
         </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="674">
-          <caret line="128" column="36" selection-start-line="128" selection-start-column="22" selection-end-line="128" selection-end-column="36" />
-        </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">
@@ -1119,13 +1075,6 @@
         </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="153">
-          <caret line="136" column="12" selection-start-line="136" selection-start-column="12" selection-end-line="233" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/home/view/public/head.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
@@ -1250,13 +1199,30 @@
         </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="444">
+          <caret line="111" column="49" selection-start-line="111" selection-start-column="40" selection-end-line="111" selection-end-column="49" />
+          <folding>
+            <element signature="e#5425#10699#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="629">
+        <state relative-caret-position="1037">
           <caret line="147" column="62" selection-start-line="147" selection-start-column="62" selection-end-line="147" selection-end-column="62" />
         </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="443">
+          <caret line="113" column="42" selection-start-line="113" selection-start-column="42" selection-end-line="113" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
--- a/application/admin/controller/MerchantGoods.php
查看文件 @2c1ad37
+++ b/application/admin/controller/MerchantGoods.php
查看文件 @2c1ad37
@@ -295,6 +295,9 @@ class MerchantGoods extends Backend
                     }
                     $params['start_time'] = strtotime($params['start_time']);
                     $params['end_time'] = strtotime($params['end_time']);
+                    if($row['status'] == 3){
+                        $param['status'] = 1;
+                    }
                     $result = $row->allowField(true)->save($params);
                     Db::commit();
                 } catch (ValidateException $e) {