郭盛 / areial · 提交

转到一个项目

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

修改预约拍摄

内嵌 并排对比
正在显示 3 个修改的文件 包含 72 行增加 和 76 行删除
... ... @@ -5,6 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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>
... ... @@ -20,7 +21,7 @@
<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="232">
<state relative-caret-position="1625">
<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" />
... ... @@ -112,8 +113,8 @@
<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" />
<state relative-caret-position="317">
<caret line="359" column="31" lean-forward="false" selection-start-line="359" selection-start-column="31" selection-end-line="359" selection-end-column="31" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
... ... @@ -124,17 +125,27 @@
<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" />
<element signature="e#17509#20987#0#PHP" expanded="false" />
<element signature="e#21016#23921#0#PHP" expanded="false" />
<element signature="e#23954#30281#0#PHP" expanded="false" />
<element signature="e#24839#26095#0#PHP" expanded="false" />
<element signature="e#26141#29646#0#PHP" expanded="false" />
<element signature="e#30304#30521#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="nsms.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -236,9 +247,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="278" />
<option name="y" value="48" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-64" />
<option name="y" value="95" />
<option name="width" value="1652" />
<option name="height" value="916" />
</component>
... ... @@ -257,8 +268,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -288,6 +297,8 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -427,7 +438,8 @@
<workItem from="1583799928944" duration="18981000" />
<workItem from="1583826020973" duration="10927000" />
<workItem from="1583848752159" duration="3638000" />
<workItem from="1583886688361" duration="18214000" />
<workItem from="1583886688361" duration="20321000" />
<workItem from="1583922378448" duration="31000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -454,7 +466,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="615353000" />
<option name="totallyTimeSpent" value="617491000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -466,17 +478,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="278" y="48" width="1652" height="916" extended-state="0" />
<editor active="true" />
<frame x="-64" y="95" width="1652" height="916" extended-state="1" />
<layout>
<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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16708542" 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="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="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46598202" 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" />
... ... @@ -524,27 +535,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/pictype/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-260">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="28" column="6" lean-forward="false" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/type/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html" />
<entry file="file://$PROJECT_DIR$/application/admin/controller/Addword.php" />
<entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json" />
... ... @@ -606,7 +596,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -614,7 +603,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
... ... @@ -812,19 +800,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/a.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1125">
<caret line="216" column="50" lean-forward="true" selection-start-line="216" selection-start-column="50" selection-end-line="216" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/a.php" />
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="39" column="148" lean-forward="false" selection-start-line="39" selection-start-column="148" selection-end-line="39" selection-end-column="148" />
<folding />
</state>
</provider>
</entry>
... ... @@ -832,7 +812,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364">
<caret line="46" column="83" lean-forward="true" selection-start-line="46" selection-start-column="83" selection-end-line="46" selection-end-column="83" />
<folding />
</state>
</provider>
</entry>
... ... @@ -848,7 +827,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="241">
<caret line="119" column="4" lean-forward="true" selection-start-line="119" selection-start-column="4" selection-end-line="124" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -856,7 +834,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="136" column="40" lean-forward="true" selection-start-line="136" selection-start-column="40" selection-end-line="136" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
... ... @@ -864,9 +841,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="227" column="35" lean-forward="true" selection-start-line="227" selection-start-column="35" selection-end-line="227" selection-end-column="35" />
<folding>
<element signature="e#2424#5390#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -874,7 +848,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="26" lean-forward="true" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
... ... @@ -882,7 +855,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="89" column="4" lean-forward="false" selection-start-line="89" selection-start-column="8" selection-end-line="94" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
... ... @@ -890,13 +862,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="88" column="10" lean-forward="true" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232">
<state relative-caret-position="1625">
<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" />
... ... @@ -984,10 +955,32 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/PHP_G_DEMO.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1050">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="73" column="58" lean-forward="true" selection-start-line="73" selection-start-column="58" selection-end-line="73" selection-end-column="58" />
</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" />
<state relative-caret-position="317">
<caret line="359" column="31" lean-forward="false" selection-start-line="359" selection-start-column="31" selection-end-line="359" selection-end-column="31" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
... ... @@ -998,12 +991,12 @@
<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" />
<element signature="e#17509#20987#0#PHP" expanded="false" />
<element signature="e#21016#23921#0#PHP" expanded="false" />
<element signature="e#23954#30281#0#PHP" expanded="false" />
<element signature="e#24839#26095#0#PHP" expanded="false" />
<element signature="e#26141#29646#0#PHP" expanded="false" />
<element signature="e#30304#30521#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -350,20 +350,23 @@ class Pay extends Api
if(empty($phone)){
$this->error('缺少必要参数');
}
$mobile = 18511199763;
$content = "【通知】仁甲看见SHOP提醒您，有新预约客户，客户电话为:$phone ，请及时回复!";
$mobile = 13780608990;
$content = "【仁甲看见SHOP】提醒您，您有新预约客户，客户电话为:$phone ，请您及时回复!";
//发送短信
$result = $this->sms($mobile,$content);
if($result == 1){
$this->success('success','成功');
}else{
$this->error('失败');
}
}
//发送短信
public function sms($mobile,$content){
$note = array(
'content' => $content,//短信内容
'mobile' => $mobile,//手机号码
'productid' => '676767',//产品id
'productid' => '676767',//模板id
'xh' => ''//小号
);
$result = $this->send_sms($note);
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-11 17:30:17 </div>
Generated on 2020-03-11 18:26:46 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...