商户申请

王晓刚
.idea/workspace.xml
application/home/controller/Index.php
--- a/.idea/workspace.xml
查看文件 @702f2b9
+++ b/.idea/workspace.xml
查看文件 @702f2b9
@@ -6,7 +6,7 @@
   <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/home/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -82,20 +82,20 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1932">
-              <caret line="184" column="9" selection-start-line="184" selection-start-column="9" selection-end-line="184" selection-end-column="9" />
+            <state relative-caret-position="470">
+              <caret line="173" column="80" lean-forward="true" selection-start-line="173" selection-start-column="80" selection-end-line="173" selection-end-column="80" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="254">
-              <caret line="314" column="33" selection-start-line="314" selection-start-column="33" selection-end-line="314" selection-end-column="33" />
+            <state relative-caret-position="288">
+              <caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" />
               <folding>
                 <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
@@ -216,7 +216,6 @@
         <option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
         <option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" />
         <option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
-        <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
         <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" />
@@ -225,6 +224,7 @@
         <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
         <option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
         <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
+        <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
       </list>
     </option>
   </component>
@@ -497,21 +497,7 @@
       <workItem from="1573174620844" duration="32581000" />
       <workItem from="1573259331081" duration="30435000" />
       <workItem from="1573432217070" duration="2199000" />
-      <workItem from="1573519427130" duration="4554000" />
-    </task>
-    <task id="LOCAL-00507" summary="    商户申请">
-      <created>1573286413188</created>
-      <option name="number" value="00507" />
-      <option name="presentableId" value="LOCAL-00507" />
-      <option name="project" value="LOCAL" />
-      <updated>1573286413188</updated>
-    </task>
-    <task id="LOCAL-00508" summary="    商户申请">
-      <created>1573287469988</created>
-      <option name="number" value="00508" />
-      <option name="presentableId" value="LOCAL-00508" />
-      <option name="project" value="LOCAL" />
-      <updated>1573287469989</updated>
+      <workItem from="1573519427130" duration="4978000" />
     </task>
     <task id="LOCAL-00509" summary="    商户申请">
       <created>1573287603492</created>
@@ -842,11 +828,25 @@
       <option name="project" value="LOCAL" />
       <updated>1573527096735</updated>
     </task>
-    <option name="localTasksCounter" value="556" />
+    <task id="LOCAL-00556" summary="    商户申请">
+      <created>1573527154986</created>
+      <option name="number" value="00556" />
+      <option name="presentableId" value="LOCAL-00556" />
+      <option name="project" value="LOCAL" />
+      <updated>1573527154986</updated>
+    </task>
+    <task id="LOCAL-00557" summary="    商户申请">
+      <created>1573527356479</created>
+      <option name="number" value="00557" />
+      <option name="presentableId" value="LOCAL-00557" />
+      <option name="project" value="LOCAL" />
+      <updated>1573527356479</updated>
+    </task>
+    <option name="localTasksCounter" value="558" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="410861000" />
+    <option name="totallyTimeSpent" value="411285000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1182,20 +1182,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1932">
-          <caret line="184" column="9" selection-start-line="184" selection-start-column="9" selection-end-line="184" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="105" column="56" selection-start-line="105" selection-start-column="56" selection-end-line="105" selection-end-column="56" />
-        </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">
@@ -1227,16 +1213,30 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="164">
+          <caret line="105" column="56" selection-start-line="105" selection-start-column="56" selection-end-line="105" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="254">
-          <caret line="314" column="33" selection-start-line="314" selection-start-column="33" selection-end-line="314" selection-end-column="33" />
+        <state relative-caret-position="288">
+          <caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" />
           <folding>
             <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="173" column="80" lean-forward="true" selection-start-line="173" selection-start-column="80" selection-end-line="173" selection-end-column="80" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
--- a/application/home/controller/Index.php
查看文件 @702f2b9
+++ b/application/home/controller/Index.php
查看文件 @702f2b9
@@ -169,7 +169,7 @@ class Index extends WechatBase
         }
         //判断性别
         if($goods['sex'] != 0){
-            if($user['gender'] == $goods['sex']){
+            if($user['gender'] != $goods['sex']){
                 $is_distance = 0;
                 $this->success('SUCCESS','',['is_where_satisfy'=>$is_distance]);
             }