diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e8cf0d3..8ae0aea 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -106,30 +106,36 @@ <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="279"> - <caret line="528" column="41" lean-forward="true" selection-start-line="528" selection-start-column="41" selection-end-line="528" selection-end-column="41" /> + <state relative-caret-position="334"> + <caret line="172" column="55" lean-forward="false" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" /> <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#16057#0#PHP" expanded="false" /> - <element signature="e#7800#9209#0#PHP" expanded="false" /> - <element signature="e#9238#13176#0#PHP" expanded="false" /> - <element signature="e#16063#16483#0#PHP" expanded="false" /> - <element signature="e#16488#26512#0#PHP" expanded="false" /> - <element signature="e#27251#30729#0#PHP" expanded="false" /> - <element signature="e#30758#33663#0#PHP" expanded="false" /> - <element signature="e#33696#39648#0#PHP" expanded="false" /> - <element signature="e#34495#35487#0#PHP" expanded="false" /> - <element signature="e#35533#39038#0#PHP" expanded="false" /> - <element signature="e#37612#37999#0#PHP" expanded="false" /> - <element signature="e#38060#39016#0#PHP" expanded="false" /> - <element signature="e#39086#39188#0#PHP" expanded="false" /> - <element signature="e#39677#46849#0#PHP" expanded="false" /> - <element signature="e#46872#47089#0#PHP" expanded="false" /> + <element signature="e#6973#14193#0#PHP" expanded="false" /> + <element signature="e#7315#7452#0#PHP" expanded="false" /> + <element signature="e#7971#8905#0#PHP" expanded="false" /> + <element signature="e#8982#9255#0#PHP" expanded="false" /> + <element signature="e#9411#11574#0#PHP" expanded="false" /> + <element signature="e#10493#11574#0#PHP" expanded="false" /> + <element signature="e#11650#12101#0#PHP" expanded="false" /> + <element signature="e#12178#13222#0#PHP" expanded="false" /> + <element signature="e#16139#16559#0#PHP" expanded="false" /> + <element signature="e#16564#26588#0#PHP" expanded="false" /> + <element signature="e#26605#26902#0#PHP" expanded="false" /> + <element signature="e#26907#27300#0#PHP" expanded="false" /> + <element signature="e#27327#30805#0#PHP" expanded="false" /> + <element signature="e#30834#33739#0#PHP" expanded="false" /> + <element signature="e#33772#39724#0#PHP" expanded="false" /> + <element signature="e#34571#35563#0#PHP" expanded="false" /> + <element signature="e#35609#39114#0#PHP" expanded="false" /> + <element signature="e#37688#38075#0#PHP" expanded="false" /> + <element signature="e#38136#39092#0#PHP" expanded="false" /> + <element signature="e#39162#39264#0#PHP" expanded="false" /> + <element signature="e#39753#46925#0#PHP" expanded="false" /> + <element signature="e#46948#47165#0#PHP" expanded="false" /> </folding> </state> </provider> @@ -233,8 +239,8 @@ </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="283" /> - <option name="y" value="56" /> + <option name="x" value="79" /> + <option name="y" value="171" /> <option name="width" value="1578" /> <option name="height" value="916" /> </component> @@ -288,7 +294,7 @@ </component> <component name="PropertiesComponent"> <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../project/zhaozhao" /> <property name="DefaultHtmlFileTemplate" value="HTML File" /> </component> <component name="RecentsManager"> @@ -386,7 +392,7 @@ <workItem from="1576214569282" duration="362000" /> <workItem from="1576221534727" duration="6278000" /> <workItem from="1576459822746" duration="19000" /> - <workItem from="1576465859692" duration="769000" /> + <workItem from="1576465859692" duration="2350000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -413,7 +419,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="439136000" /> + <option name="totallyTimeSpent" value="440717000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -425,7 +431,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="283" y="56" width="1578" height="916" extended-state="1" /> + <frame x="79" y="171" width="1578" height="916" extended-state="1" /> <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.17325428" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> @@ -1125,30 +1131,36 @@ </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="279"> - <caret line="528" column="41" lean-forward="true" selection-start-line="528" selection-start-column="41" selection-end-line="528" selection-end-column="41" /> + <state relative-caret-position="334"> + <caret line="172" column="55" lean-forward="false" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" /> <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#16057#0#PHP" expanded="false" /> - <element signature="e#7800#9209#0#PHP" expanded="false" /> - <element signature="e#9238#13176#0#PHP" expanded="false" /> - <element signature="e#16063#16483#0#PHP" expanded="false" /> - <element signature="e#16488#26512#0#PHP" expanded="false" /> - <element signature="e#27251#30729#0#PHP" expanded="false" /> - <element signature="e#30758#33663#0#PHP" expanded="false" /> - <element signature="e#33696#39648#0#PHP" expanded="false" /> - <element signature="e#34495#35487#0#PHP" expanded="false" /> - <element signature="e#35533#39038#0#PHP" expanded="false" /> - <element signature="e#37612#37999#0#PHP" expanded="false" /> - <element signature="e#38060#39016#0#PHP" expanded="false" /> - <element signature="e#39086#39188#0#PHP" expanded="false" /> - <element signature="e#39677#46849#0#PHP" expanded="false" /> - <element signature="e#46872#47089#0#PHP" expanded="false" /> + <element signature="e#6973#14193#0#PHP" expanded="false" /> + <element signature="e#7315#7452#0#PHP" expanded="false" /> + <element signature="e#7971#8905#0#PHP" expanded="false" /> + <element signature="e#8982#9255#0#PHP" expanded="false" /> + <element signature="e#9411#11574#0#PHP" expanded="false" /> + <element signature="e#10493#11574#0#PHP" expanded="false" /> + <element signature="e#11650#12101#0#PHP" expanded="false" /> + <element signature="e#12178#13222#0#PHP" expanded="false" /> + <element signature="e#16139#16559#0#PHP" expanded="false" /> + <element signature="e#16564#26588#0#PHP" expanded="false" /> + <element signature="e#26605#26902#0#PHP" expanded="false" /> + <element signature="e#26907#27300#0#PHP" expanded="false" /> + <element signature="e#27327#30805#0#PHP" expanded="false" /> + <element signature="e#30834#33739#0#PHP" expanded="false" /> + <element signature="e#33772#39724#0#PHP" expanded="false" /> + <element signature="e#34571#35563#0#PHP" expanded="false" /> + <element signature="e#35609#39114#0#PHP" expanded="false" /> + <element signature="e#37688#38075#0#PHP" expanded="false" /> + <element signature="e#38136#39092#0#PHP" expanded="false" /> + <element signature="e#39162#39264#0#PHP" expanded="false" /> + <element signature="e#39753#46925#0#PHP" expanded="false" /> + <element signature="e#46948#47165#0#PHP" expanded="false" /> </folding> </state> </provider> diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php index 56e6621..ce0cf6c 100644 --- a/application/api/controller/Pay.php +++ b/application/api/controller/Pay.php @@ -166,9 +166,11 @@ class Pay extends Api $this->error(['code'=>2,'msg'=>'openid不能为空']); } $data = Db::name('order')->where('id',$order_id)->find(); - $pic_id = explode(',',$data['pic_id']); + $pic_id = []; + if($data['pic_id']){ + $pic_id = explode(',',$data['pic_id']); + } $video_id = unserialize($data['video_id']); - //查询用户表 取出手机号 $user = Db::name('user')->where('id',$data['user_id'])->find(); $mobile = $user['mobile'];