正在显示
2 个修改的文件
包含
30 行增加
和
32 行删除
@@ -2,9 +2,7 @@ | @@ -2,9 +2,7 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | 4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> |
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
6 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> | 5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> |
7 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | ||
8 | </list> | 6 | </list> |
9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
10 | <option name="TRACKING_ENABLED" value="true" /> | 8 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -105,8 +103,8 @@ | @@ -105,8 +103,8 @@ | ||
105 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> | 103 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> |
106 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 104 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
107 | <provider selected="true" editor-type-id="text-editor"> | 105 | <provider selected="true" editor-type-id="text-editor"> |
108 | - <state relative-caret-position="251"> | ||
109 | - <caret line="621" column="5" lean-forward="true" selection-start-line="621" selection-start-column="5" selection-end-line="621" selection-end-column="5" /> | 106 | + <state relative-caret-position="175"> |
107 | + <caret line="545" column="5" lean-forward="true" selection-start-line="545" selection-start-column="5" selection-end-line="545" selection-end-column="5" /> | ||
110 | <folding> | 108 | <folding> |
111 | <element signature="e#706#1019#0#PHP" expanded="false" /> | 109 | <element signature="e#706#1019#0#PHP" expanded="false" /> |
112 | <element signature="e#1024#3100#0#PHP" expanded="false" /> | 110 | <element signature="e#1024#3100#0#PHP" expanded="false" /> |
@@ -114,8 +112,8 @@ | @@ -114,8 +112,8 @@ | ||
114 | <element signature="e#3431#5513#0#PHP" expanded="false" /> | 112 | <element signature="e#3431#5513#0#PHP" expanded="false" /> |
115 | <element signature="e#5519#5937#0#PHP" expanded="false" /> | 113 | <element signature="e#5519#5937#0#PHP" expanded="false" /> |
116 | <element signature="e#5942#16057#0#PHP" expanded="false" /> | 114 | <element signature="e#5942#16057#0#PHP" expanded="false" /> |
117 | - <element signature="e#6834#15990#0#PHP" expanded="false" /> | ||
118 | <element signature="e#7800#9209#0#PHP" expanded="false" /> | 115 | <element signature="e#7800#9209#0#PHP" expanded="false" /> |
116 | + <element signature="e#9238#13176#0#PHP" expanded="false" /> | ||
119 | <element signature="e#14215#15990#0#PHP" expanded="false" /> | 117 | <element signature="e#14215#15990#0#PHP" expanded="false" /> |
120 | <element signature="e#16063#16483#0#PHP" expanded="false" /> | 118 | <element signature="e#16063#16483#0#PHP" expanded="false" /> |
121 | <element signature="e#16488#26512#0#PHP" expanded="false" /> | 119 | <element signature="e#16488#26512#0#PHP" expanded="false" /> |
@@ -123,14 +121,14 @@ | @@ -123,14 +121,14 @@ | ||
123 | <element signature="e#26831#27224#0#PHP" expanded="false" /> | 121 | <element signature="e#26831#27224#0#PHP" expanded="false" /> |
124 | <element signature="e#27251#30729#0#PHP" expanded="false" /> | 122 | <element signature="e#27251#30729#0#PHP" expanded="false" /> |
125 | <element signature="e#30758#33662#0#PHP" expanded="false" /> | 123 | <element signature="e#30758#33662#0#PHP" expanded="false" /> |
126 | - <element signature="e#33695#39626#0#PHP" expanded="false" /> | ||
127 | - <element signature="e#34473#35465#0#PHP" expanded="false" /> | ||
128 | - <element signature="e#35511#39016#0#PHP" expanded="false" /> | ||
129 | - <element signature="e#37590#37977#0#PHP" expanded="false" /> | ||
130 | - <element signature="e#38038#38994#0#PHP" expanded="false" /> | ||
131 | - <element signature="e#39064#39166#0#PHP" expanded="false" /> | ||
132 | - <element signature="e#39655#46827#0#PHP" expanded="false" /> | ||
133 | - <element signature="e#46850#47067#0#PHP" expanded="false" /> | 124 | + <element signature="e#33695#39647#0#PHP" expanded="false" /> |
125 | + <element signature="e#34494#35486#0#PHP" expanded="false" /> | ||
126 | + <element signature="e#35532#39037#0#PHP" expanded="false" /> | ||
127 | + <element signature="e#37611#37998#0#PHP" expanded="false" /> | ||
128 | + <element signature="e#38059#39015#0#PHP" expanded="false" /> | ||
129 | + <element signature="e#39085#39187#0#PHP" expanded="false" /> | ||
130 | + <element signature="e#39676#46848#0#PHP" expanded="false" /> | ||
131 | + <element signature="e#46871#47088#0#PHP" expanded="false" /> | ||
134 | </folding> | 132 | </folding> |
135 | </state> | 133 | </state> |
136 | </provider> | 134 | </provider> |
@@ -233,9 +231,9 @@ | @@ -233,9 +231,9 @@ | ||
233 | <sorting>DEFINITION_ORDER</sorting> | 231 | <sorting>DEFINITION_ORDER</sorting> |
234 | </component> | 232 | </component> |
235 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 233 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
236 | - <component name="ProjectFrameBounds" extendedState="1"> | ||
237 | - <option name="x" value="316" /> | ||
238 | - <option name="y" value="71" /> | 234 | + <component name="ProjectFrameBounds"> |
235 | + <option name="x" value="375" /> | ||
236 | + <option name="y" value="55" /> | ||
239 | <option name="width" value="1569" /> | 237 | <option name="width" value="1569" /> |
240 | <option name="height" value="937" /> | 238 | <option name="height" value="937" /> |
241 | </component> | 239 | </component> |
@@ -381,7 +379,7 @@ | @@ -381,7 +379,7 @@ | ||
381 | <workItem from="1575979358020" duration="2589000" /> | 379 | <workItem from="1575979358020" duration="2589000" /> |
382 | <workItem from="1576028218954" duration="680000" /> | 380 | <workItem from="1576028218954" duration="680000" /> |
383 | <workItem from="1576128183316" duration="7364000" /> | 381 | <workItem from="1576128183316" duration="7364000" /> |
384 | - <workItem from="1576135696788" duration="8501000" /> | 382 | + <workItem from="1576135696788" duration="8720000" /> |
385 | </task> | 383 | </task> |
386 | <task id="LOCAL-00001" summary="调试"> | 384 | <task id="LOCAL-00001" summary="调试"> |
387 | <created>1574145133364</created> | 385 | <created>1574145133364</created> |
@@ -408,7 +406,7 @@ | @@ -408,7 +406,7 @@ | ||
408 | <servers /> | 406 | <servers /> |
409 | </component> | 407 | </component> |
410 | <component name="TimeTrackingManager"> | 408 | <component name="TimeTrackingManager"> |
411 | - <option name="totallyTimeSpent" value="406099000" /> | 409 | + <option name="totallyTimeSpent" value="406318000" /> |
412 | </component> | 410 | </component> |
413 | <component name="TodoView"> | 411 | <component name="TodoView"> |
414 | <todo-panel id="selected-file"> | 412 | <todo-panel id="selected-file"> |
@@ -420,7 +418,7 @@ | @@ -420,7 +418,7 @@ | ||
420 | </todo-panel> | 418 | </todo-panel> |
421 | </component> | 419 | </component> |
422 | <component name="ToolWindowManager"> | 420 | <component name="ToolWindowManager"> |
423 | - <frame x="316" y="71" width="1569" height="937" extended-state="1" /> | 421 | + <frame x="375" y="55" width="1569" height="937" extended-state="0" /> |
424 | <editor active="true" /> | 422 | <editor active="true" /> |
425 | <layout> | 423 | <layout> |
426 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17760105" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 424 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17760105" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
@@ -473,7 +471,7 @@ | @@ -473,7 +471,7 @@ | ||
473 | </component> | 471 | </component> |
474 | <component name="XDebuggerManager"> | 472 | <component name="XDebuggerManager"> |
475 | <breakpoint-manager> | 473 | <breakpoint-manager> |
476 | - <option name="time" value="23" /> | 474 | + <option name="time" value="24" /> |
477 | </breakpoint-manager> | 475 | </breakpoint-manager> |
478 | <watches-manager /> | 476 | <watches-manager /> |
479 | </component> | 477 | </component> |
@@ -1105,8 +1103,8 @@ | @@ -1105,8 +1103,8 @@ | ||
1105 | </entry> | 1103 | </entry> |
1106 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 1104 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
1107 | <provider selected="true" editor-type-id="text-editor"> | 1105 | <provider selected="true" editor-type-id="text-editor"> |
1108 | - <state relative-caret-position="251"> | ||
1109 | - <caret line="621" column="5" lean-forward="true" selection-start-line="621" selection-start-column="5" selection-end-line="621" selection-end-column="5" /> | 1106 | + <state relative-caret-position="175"> |
1107 | + <caret line="545" column="5" lean-forward="true" selection-start-line="545" selection-start-column="5" selection-end-line="545" selection-end-column="5" /> | ||
1110 | <folding> | 1108 | <folding> |
1111 | <element signature="e#706#1019#0#PHP" expanded="false" /> | 1109 | <element signature="e#706#1019#0#PHP" expanded="false" /> |
1112 | <element signature="e#1024#3100#0#PHP" expanded="false" /> | 1110 | <element signature="e#1024#3100#0#PHP" expanded="false" /> |
@@ -1114,8 +1112,8 @@ | @@ -1114,8 +1112,8 @@ | ||
1114 | <element signature="e#3431#5513#0#PHP" expanded="false" /> | 1112 | <element signature="e#3431#5513#0#PHP" expanded="false" /> |
1115 | <element signature="e#5519#5937#0#PHP" expanded="false" /> | 1113 | <element signature="e#5519#5937#0#PHP" expanded="false" /> |
1116 | <element signature="e#5942#16057#0#PHP" expanded="false" /> | 1114 | <element signature="e#5942#16057#0#PHP" expanded="false" /> |
1117 | - <element signature="e#6834#15990#0#PHP" expanded="false" /> | ||
1118 | <element signature="e#7800#9209#0#PHP" expanded="false" /> | 1115 | <element signature="e#7800#9209#0#PHP" expanded="false" /> |
1116 | + <element signature="e#9238#13176#0#PHP" expanded="false" /> | ||
1119 | <element signature="e#14215#15990#0#PHP" expanded="false" /> | 1117 | <element signature="e#14215#15990#0#PHP" expanded="false" /> |
1120 | <element signature="e#16063#16483#0#PHP" expanded="false" /> | 1118 | <element signature="e#16063#16483#0#PHP" expanded="false" /> |
1121 | <element signature="e#16488#26512#0#PHP" expanded="false" /> | 1119 | <element signature="e#16488#26512#0#PHP" expanded="false" /> |
@@ -1123,14 +1121,14 @@ | @@ -1123,14 +1121,14 @@ | ||
1123 | <element signature="e#26831#27224#0#PHP" expanded="false" /> | 1121 | <element signature="e#26831#27224#0#PHP" expanded="false" /> |
1124 | <element signature="e#27251#30729#0#PHP" expanded="false" /> | 1122 | <element signature="e#27251#30729#0#PHP" expanded="false" /> |
1125 | <element signature="e#30758#33662#0#PHP" expanded="false" /> | 1123 | <element signature="e#30758#33662#0#PHP" expanded="false" /> |
1126 | - <element signature="e#33695#39626#0#PHP" expanded="false" /> | ||
1127 | - <element signature="e#34473#35465#0#PHP" expanded="false" /> | ||
1128 | - <element signature="e#35511#39016#0#PHP" expanded="false" /> | ||
1129 | - <element signature="e#37590#37977#0#PHP" expanded="false" /> | ||
1130 | - <element signature="e#38038#38994#0#PHP" expanded="false" /> | ||
1131 | - <element signature="e#39064#39166#0#PHP" expanded="false" /> | ||
1132 | - <element signature="e#39655#46827#0#PHP" expanded="false" /> | ||
1133 | - <element signature="e#46850#47067#0#PHP" expanded="false" /> | 1124 | + <element signature="e#33695#39647#0#PHP" expanded="false" /> |
1125 | + <element signature="e#34494#35486#0#PHP" expanded="false" /> | ||
1126 | + <element signature="e#35532#39037#0#PHP" expanded="false" /> | ||
1127 | + <element signature="e#37611#37998#0#PHP" expanded="false" /> | ||
1128 | + <element signature="e#38059#39015#0#PHP" expanded="false" /> | ||
1129 | + <element signature="e#39085#39187#0#PHP" expanded="false" /> | ||
1130 | + <element signature="e#39676#46848#0#PHP" expanded="false" /> | ||
1131 | + <element signature="e#46871#47088#0#PHP" expanded="false" /> | ||
1134 | </folding> | 1132 | </folding> |
1135 | </state> | 1133 | </state> |
1136 | </provider> | 1134 | </provider> |
@@ -699,7 +699,7 @@ class Pay extends Api | @@ -699,7 +699,7 @@ class Pay extends Api | ||
699 | //查询该用户信息以及是否为会员身份 | 699 | //查询该用户信息以及是否为会员身份 |
700 | $user = Db::name('user')->where('id',$data['user_id'])->find(); | 700 | $user = Db::name('user')->where('id',$data['user_id'])->find(); |
701 | $mobile = $user['mobile']; | 701 | $mobile = $user['mobile']; |
702 | - $str = "【仁甲看见】"; | 702 | + $str = "【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。"; |
703 | 703 | ||
704 | //return_code 表示通信状态 | 704 | //return_code 表示通信状态 |
705 | if ($message['return_code'] === 'SUCCESS') { | 705 | if ($message['return_code'] === 'SUCCESS') { |
-
请 注册 或 登录 后发表评论