1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Trolley.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Trolley.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Address.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -138,7 +138,7 @@
     <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../yyyfs" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../firstsy" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -416,7 +416,8 @@
       <workItem from="1693874624473" duration="24108000" />
       <workItem from="1693961752874" duration="17119000" />
       <workItem from="1694048197092" duration="22485000" />
-      <workItem from="1694134843963" duration="44776000" />
+      <workItem from="1694134843963" duration="47639000" />
+      <workItem from="1694392543142" duration="2738000" />
     </task>
     <servers />
   </component>
@@ -550,10 +551,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="360" y="413" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1694141245467" />
-    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1694239845660">
+    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1694394679618">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1694239845660" />
+    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1694394679618" />
     <state width="498" height="446" key="SwitcherDM" timestamp="1693380266237">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Address.php

@@ -189,7 +189,7 @@ class Address extends Base
     public function getDefaultAddress()
     {
         $default  = DeliveryAddress::where(['user_id'=>$this->user_id,'is_mr'=>1])->find();
-        $detail = $default ? $default->toArray() : '';
+        $detail = $default ? $default->toArray() : null;
         $this->success('ok',$detail);
     }