郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 051c27cf5673dfed97952c6bc40f59e23ad3666b 1 个父辈 fbb66fea
1 个管道 的构建 通过 耗费 5 秒

添加预约拍摄接口

内嵌 并排对比
正在显示 3 个修改的文件 包含 97 行增加 和 42 行删除
... ... @@ -5,7 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -17,11 +17,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="918" column="44" lean-forward="true" selection-start-line="918" selection-start-column="44" selection-end-line="918" selection-end-column="44" />
<state relative-caret-position="232">
<caret line="836" column="32" lean-forward="false" selection-start-line="836" selection-start-column="32" selection-end-line="836" selection-end-column="32" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -54,6 +54,8 @@
<element signature="e#22518#26568#0#PHP" expanded="false" />
<element signature="e#26574#26951#0#PHP" expanded="false" />
<element signature="e#26956#27395#0#PHP" expanded="false" />
<element signature="e#27401#28222#0#PHP" expanded="false" />
<element signature="e#28227#31631#0#PHP" expanded="false" />
<element signature="e#28673#31625#0#PHP" expanded="false" />
<element signature="e#31637#32142#0#PHP" expanded="false" />
<element signature="e#32147#32398#0#PHP" expanded="false" />
... ... @@ -107,6 +109,32 @@
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="512">
<caret line="354" column="14" lean-forward="true" selection-start-line="354" selection-start-column="14" selection-end-line="354" selection-end-column="14" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15963#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#17384#20862#0#PHP" expanded="false" />
<element signature="e#20891#23796#0#PHP" expanded="false" />
<element signature="e#23829#30156#0#PHP" expanded="false" />
<element signature="e#24714#25970#0#PHP" expanded="false" />
<element signature="e#26016#29521#0#PHP" expanded="false" />
<element signature="e#30179#30396#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -184,13 +212,13 @@
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/api/controller/a.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -208,11 +236,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="150" />
<option name="y" value="87" />
<component name="ProjectFrameBounds">
<option name="x" value="278" />
<option name="y" value="48" />
<option name="width" value="1652" />
<option name="height" value="917" />
<option name="height" value="916" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -399,7 +427,7 @@
<workItem from="1583799928944" duration="18981000" />
<workItem from="1583826020973" duration="10927000" />
<workItem from="1583848752159" duration="3638000" />
<workItem from="1583886688361" duration="16488000" />
<workItem from="1583886688361" duration="18214000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -426,7 +454,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="613627000" />
<option name="totallyTimeSpent" value="615353000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -438,16 +466,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="150" y="87" width="1652" height="917" extended-state="1" />
<frame x="278" y="48" width="1652" height="916" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16520101" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16520101" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46666667" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46666667" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -791,32 +820,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="711">
<caret line="613" column="24" lean-forward="true" selection-start-line="613" selection-start-column="24" selection-end-line="613" selection-end-column="24" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15963#0#PHP" expanded="false" />
<element signature="e#6918#15896#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#15980#16277#0#PHP" expanded="false" />
<element signature="e#16282#16675#0#PHP" expanded="false" />
<element signature="e#16702#20180#0#PHP" expanded="false" />
<element signature="e#20209#23114#0#PHP" expanded="false" />
<element signature="e#24032#25288#0#PHP" expanded="false" />
<element signature="e#25334#28839#0#PHP" expanded="false" />
<element signature="e#29497#29714#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
... ... @@ -893,8 +896,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="918" column="44" lean-forward="true" selection-start-line="918" selection-start-column="44" selection-end-line="918" selection-end-column="44" />
<state relative-caret-position="232">
<caret line="836" column="32" lean-forward="false" selection-start-line="836" selection-start-column="32" selection-end-line="836" selection-end-column="32" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -927,6 +930,8 @@
<element signature="e#22518#26568#0#PHP" expanded="false" />
<element signature="e#26574#26951#0#PHP" expanded="false" />
<element signature="e#26956#27395#0#PHP" expanded="false" />
<element signature="e#27401#28222#0#PHP" expanded="false" />
<element signature="e#28227#31631#0#PHP" expanded="false" />
<element signature="e#28673#31625#0#PHP" expanded="false" />
<element signature="e#31637#32142#0#PHP" expanded="false" />
<element signature="e#32147#32398#0#PHP" expanded="false" />
... ... @@ -979,5 +984,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="512">
<caret line="354" column="14" lean-forward="true" selection-start-line="354" selection-start-column="14" selection-end-line="354" selection-end-column="14" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15963#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#17384#20862#0#PHP" expanded="false" />
<element signature="e#20891#23796#0#PHP" expanded="false" />
<element signature="e#23829#30156#0#PHP" expanded="false" />
<element signature="e#24714#25970#0#PHP" expanded="false" />
<element signature="e#26016#29521#0#PHP" expanded="false" />
<element signature="e#30179#30396#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -332,6 +332,32 @@ class Pay extends Api
}
}
/**
* @ApiTitle (预约拍摄)
* @ApiSummary (预约拍摄)
* @ApiMethod (POST)
* @ApiRoute (/api/pay/appointment)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="phone", type="inter", required=true, description="手机号")
*
*/
public function appointment()
{
$u_id = $this->uid;
$phone = $this->request->param('phone');
if(empty($phone)){
$this->error('缺少必要参数');
}
$mobile = 18511199763;
$content = "【通知】仁甲看见SHOP提醒您，有新预约客户，客户电话为:$phone ，请及时回复!";
//发送短信
$result = $this->sms($mobile,$content);
}
//发送短信
public function sms($mobile,$content){
$note = array(
... ...
此 diff 太大无法显示。