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/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <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" />
@@ -165,7 +165,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$/../../jiaocai" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <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" />
@@ -594,7 +594,9 @@
       <workItem from="1713400278236" duration="25153000" />
       <workItem from="1713486783613" duration="18361000" />
       <workItem from="1713916802858" duration="19129000" />
-      <workItem from="1714004926744" duration="25717000" />
+      <workItem from="1714004926744" duration="26309000" />
+      <workItem from="1714091498498" duration="11116000" />
+      <workItem from="1714109915098" duration="57000" />
     </task>
     <servers />
   </component>

application/api/controller/Activity.php

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