wupengfei hace 1 año
padre
commit
cce18d55fa
Se han modificado 2 ficheros con 5 adiciones y 2 borrados
  1. 4 2
      .idea/workspace.xml
  2. 1 0
      application/api/controller/Activity.php

+ 4 - 2
.idea/workspace.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -322,7 +324,7 @@
       <workItem from="1684370285483" duration="21209000" />
       <workItem from="1684457633587" duration="21568000" />
       <workItem from="1684543423796" duration="10653000" />
-      <workItem from="1684716593546" duration="3342000" />
+      <workItem from="1684716593546" duration="3612000" />
     </task>
     <servers />
   </component>

+ 1 - 0
application/api/controller/Activity.php

@@ -1378,6 +1378,7 @@ class Activity extends Base
      * @return name:logo type:string default:-- desc:快递公司LOGO
      */
     public function deliveryDetails(){
+        $this->success('ok', get_delivery());
         $send_no = BillApply::where('id',input('get.id'))->value('express_send_no');
         if(!$send_no) $this->error('订单没有发货');
         $data = get_delivery($send_no);