chuweiqiang 11 months ago
parent
commit
cf0b1ad359
2 changed files with 3 additions and 3 deletions
  1. 2 2
      .idea/workspace.xml
  2. 1 1
      application/api/controller/Order.php

+ 2 - 2
.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/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -594,7 +594,7 @@
       <workItem from="1713400278236" duration="25153000" />
       <workItem from="1713486783613" duration="18361000" />
       <workItem from="1713916802858" duration="19129000" />
-      <workItem from="1714004926744" duration="23498000" />
+      <workItem from="1714004926744" duration="23861000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/api/controller/Order.php

@@ -428,7 +428,7 @@ class Order extends Base
                     break;
                 case 7:
                     $notify_url = $this->request->root(true) . '/api/Alipay/goodsOrderNotify';
-                    $return_url ='https://'.$_SERVER['HTTP_HOST']."/pc/?#/product/my-order";
+                    $return_url ='https://'.$_SERVER['HTTP_HOST']."/pc/?#/product/my-order#";
                     $config = Alipay::ali_pay_pc('订单支付',$pay_no,$order_info['price_total'],$notify_url,$return_url);
                     $ret_data['config']['ali_url'] = $config;
                     $ret_data['ali_url'] = $config;