正在显示
2 个修改的文件
包含
58 行增加
和
44 行删除
@@ -106,30 +106,36 @@ | @@ -106,30 +106,36 @@ | ||
106 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> | 106 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> |
107 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 107 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
108 | <provider selected="true" editor-type-id="text-editor"> | 108 | <provider selected="true" editor-type-id="text-editor"> |
109 | - <state relative-caret-position="279"> | ||
110 | - <caret line="528" column="41" lean-forward="true" selection-start-line="528" selection-start-column="41" selection-end-line="528" selection-end-column="41" /> | 109 | + <state relative-caret-position="334"> |
110 | + <caret line="172" column="55" lean-forward="false" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" /> | ||
111 | <folding> | 111 | <folding> |
112 | <element signature="e#581#700#0#PHP" expanded="false" /> | 112 | <element signature="e#581#700#0#PHP" expanded="false" /> |
113 | <element signature="e#706#1019#0#PHP" expanded="false" /> | 113 | <element signature="e#706#1019#0#PHP" expanded="false" /> |
114 | <element signature="e#1024#3100#0#PHP" expanded="false" /> | 114 | <element signature="e#1024#3100#0#PHP" expanded="false" /> |
115 | <element signature="e#3106#3426#0#PHP" expanded="false" /> | 115 | <element signature="e#3106#3426#0#PHP" expanded="false" /> |
116 | <element signature="e#3431#5513#0#PHP" expanded="false" /> | 116 | <element signature="e#3431#5513#0#PHP" expanded="false" /> |
117 | - <element signature="e#5519#5937#0#PHP" expanded="false" /> | ||
118 | - <element signature="e#5942#16057#0#PHP" expanded="false" /> | ||
119 | - <element signature="e#7800#9209#0#PHP" expanded="false" /> | ||
120 | - <element signature="e#9238#13176#0#PHP" expanded="false" /> | ||
121 | - <element signature="e#16063#16483#0#PHP" expanded="false" /> | ||
122 | - <element signature="e#16488#26512#0#PHP" expanded="false" /> | ||
123 | - <element signature="e#27251#30729#0#PHP" expanded="false" /> | ||
124 | - <element signature="e#30758#33663#0#PHP" expanded="false" /> | ||
125 | - <element signature="e#33696#39648#0#PHP" expanded="false" /> | ||
126 | - <element signature="e#34495#35487#0#PHP" expanded="false" /> | ||
127 | - <element signature="e#35533#39038#0#PHP" expanded="false" /> | ||
128 | - <element signature="e#37612#37999#0#PHP" expanded="false" /> | ||
129 | - <element signature="e#38060#39016#0#PHP" expanded="false" /> | ||
130 | - <element signature="e#39086#39188#0#PHP" expanded="false" /> | ||
131 | - <element signature="e#39677#46849#0#PHP" expanded="false" /> | ||
132 | - <element signature="e#46872#47089#0#PHP" expanded="false" /> | 117 | + <element signature="e#6973#14193#0#PHP" expanded="false" /> |
118 | + <element signature="e#7315#7452#0#PHP" expanded="false" /> | ||
119 | + <element signature="e#7971#8905#0#PHP" expanded="false" /> | ||
120 | + <element signature="e#8982#9255#0#PHP" expanded="false" /> | ||
121 | + <element signature="e#9411#11574#0#PHP" expanded="false" /> | ||
122 | + <element signature="e#10493#11574#0#PHP" expanded="false" /> | ||
123 | + <element signature="e#11650#12101#0#PHP" expanded="false" /> | ||
124 | + <element signature="e#12178#13222#0#PHP" expanded="false" /> | ||
125 | + <element signature="e#16139#16559#0#PHP" expanded="false" /> | ||
126 | + <element signature="e#16564#26588#0#PHP" expanded="false" /> | ||
127 | + <element signature="e#26605#26902#0#PHP" expanded="false" /> | ||
128 | + <element signature="e#26907#27300#0#PHP" expanded="false" /> | ||
129 | + <element signature="e#27327#30805#0#PHP" expanded="false" /> | ||
130 | + <element signature="e#30834#33739#0#PHP" expanded="false" /> | ||
131 | + <element signature="e#33772#39724#0#PHP" expanded="false" /> | ||
132 | + <element signature="e#34571#35563#0#PHP" expanded="false" /> | ||
133 | + <element signature="e#35609#39114#0#PHP" expanded="false" /> | ||
134 | + <element signature="e#37688#38075#0#PHP" expanded="false" /> | ||
135 | + <element signature="e#38136#39092#0#PHP" expanded="false" /> | ||
136 | + <element signature="e#39162#39264#0#PHP" expanded="false" /> | ||
137 | + <element signature="e#39753#46925#0#PHP" expanded="false" /> | ||
138 | + <element signature="e#46948#47165#0#PHP" expanded="false" /> | ||
133 | </folding> | 139 | </folding> |
134 | </state> | 140 | </state> |
135 | </provider> | 141 | </provider> |
@@ -233,8 +239,8 @@ | @@ -233,8 +239,8 @@ | ||
233 | </component> | 239 | </component> |
234 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 240 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
235 | <component name="ProjectFrameBounds" extendedState="1"> | 241 | <component name="ProjectFrameBounds" extendedState="1"> |
236 | - <option name="x" value="283" /> | ||
237 | - <option name="y" value="56" /> | 242 | + <option name="x" value="79" /> |
243 | + <option name="y" value="171" /> | ||
238 | <option name="width" value="1578" /> | 244 | <option name="width" value="1578" /> |
239 | <option name="height" value="916" /> | 245 | <option name="height" value="916" /> |
240 | </component> | 246 | </component> |
@@ -288,7 +294,7 @@ | @@ -288,7 +294,7 @@ | ||
288 | </component> | 294 | </component> |
289 | <component name="PropertiesComponent"> | 295 | <component name="PropertiesComponent"> |
290 | <property name="WebServerToolWindowFactoryState" value="false" /> | 296 | <property name="WebServerToolWindowFactoryState" value="false" /> |
291 | - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> | 297 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../project/zhaozhao" /> |
292 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> | 298 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
293 | </component> | 299 | </component> |
294 | <component name="RecentsManager"> | 300 | <component name="RecentsManager"> |
@@ -386,7 +392,7 @@ | @@ -386,7 +392,7 @@ | ||
386 | <workItem from="1576214569282" duration="362000" /> | 392 | <workItem from="1576214569282" duration="362000" /> |
387 | <workItem from="1576221534727" duration="6278000" /> | 393 | <workItem from="1576221534727" duration="6278000" /> |
388 | <workItem from="1576459822746" duration="19000" /> | 394 | <workItem from="1576459822746" duration="19000" /> |
389 | - <workItem from="1576465859692" duration="769000" /> | 395 | + <workItem from="1576465859692" duration="2350000" /> |
390 | </task> | 396 | </task> |
391 | <task id="LOCAL-00001" summary="调试"> | 397 | <task id="LOCAL-00001" summary="调试"> |
392 | <created>1574145133364</created> | 398 | <created>1574145133364</created> |
@@ -413,7 +419,7 @@ | @@ -413,7 +419,7 @@ | ||
413 | <servers /> | 419 | <servers /> |
414 | </component> | 420 | </component> |
415 | <component name="TimeTrackingManager"> | 421 | <component name="TimeTrackingManager"> |
416 | - <option name="totallyTimeSpent" value="439136000" /> | 422 | + <option name="totallyTimeSpent" value="440717000" /> |
417 | </component> | 423 | </component> |
418 | <component name="TodoView"> | 424 | <component name="TodoView"> |
419 | <todo-panel id="selected-file"> | 425 | <todo-panel id="selected-file"> |
@@ -425,7 +431,7 @@ | @@ -425,7 +431,7 @@ | ||
425 | </todo-panel> | 431 | </todo-panel> |
426 | </component> | 432 | </component> |
427 | <component name="ToolWindowManager"> | 433 | <component name="ToolWindowManager"> |
428 | - <frame x="283" y="56" width="1578" height="916" extended-state="1" /> | 434 | + <frame x="79" y="171" width="1578" height="916" extended-state="1" /> |
429 | <editor active="true" /> | 435 | <editor active="true" /> |
430 | <layout> | 436 | <layout> |
431 | <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" /> | 437 | <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 @@ | @@ -1125,30 +1131,36 @@ | ||
1125 | </entry> | 1131 | </entry> |
1126 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 1132 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
1127 | <provider selected="true" editor-type-id="text-editor"> | 1133 | <provider selected="true" editor-type-id="text-editor"> |
1128 | - <state relative-caret-position="279"> | ||
1129 | - <caret line="528" column="41" lean-forward="true" selection-start-line="528" selection-start-column="41" selection-end-line="528" selection-end-column="41" /> | 1134 | + <state relative-caret-position="334"> |
1135 | + <caret line="172" column="55" lean-forward="false" selection-start-line="172" selection-start-column="55" selection-end-line="172" selection-end-column="55" /> | ||
1130 | <folding> | 1136 | <folding> |
1131 | <element signature="e#581#700#0#PHP" expanded="false" /> | 1137 | <element signature="e#581#700#0#PHP" expanded="false" /> |
1132 | <element signature="e#706#1019#0#PHP" expanded="false" /> | 1138 | <element signature="e#706#1019#0#PHP" expanded="false" /> |
1133 | <element signature="e#1024#3100#0#PHP" expanded="false" /> | 1139 | <element signature="e#1024#3100#0#PHP" expanded="false" /> |
1134 | <element signature="e#3106#3426#0#PHP" expanded="false" /> | 1140 | <element signature="e#3106#3426#0#PHP" expanded="false" /> |
1135 | <element signature="e#3431#5513#0#PHP" expanded="false" /> | 1141 | <element signature="e#3431#5513#0#PHP" expanded="false" /> |
1136 | - <element signature="e#5519#5937#0#PHP" expanded="false" /> | ||
1137 | - <element signature="e#5942#16057#0#PHP" expanded="false" /> | ||
1138 | - <element signature="e#7800#9209#0#PHP" expanded="false" /> | ||
1139 | - <element signature="e#9238#13176#0#PHP" expanded="false" /> | ||
1140 | - <element signature="e#16063#16483#0#PHP" expanded="false" /> | ||
1141 | - <element signature="e#16488#26512#0#PHP" expanded="false" /> | ||
1142 | - <element signature="e#27251#30729#0#PHP" expanded="false" /> | ||
1143 | - <element signature="e#30758#33663#0#PHP" expanded="false" /> | ||
1144 | - <element signature="e#33696#39648#0#PHP" expanded="false" /> | ||
1145 | - <element signature="e#34495#35487#0#PHP" expanded="false" /> | ||
1146 | - <element signature="e#35533#39038#0#PHP" expanded="false" /> | ||
1147 | - <element signature="e#37612#37999#0#PHP" expanded="false" /> | ||
1148 | - <element signature="e#38060#39016#0#PHP" expanded="false" /> | ||
1149 | - <element signature="e#39086#39188#0#PHP" expanded="false" /> | ||
1150 | - <element signature="e#39677#46849#0#PHP" expanded="false" /> | ||
1151 | - <element signature="e#46872#47089#0#PHP" expanded="false" /> | 1142 | + <element signature="e#6973#14193#0#PHP" expanded="false" /> |
1143 | + <element signature="e#7315#7452#0#PHP" expanded="false" /> | ||
1144 | + <element signature="e#7971#8905#0#PHP" expanded="false" /> | ||
1145 | + <element signature="e#8982#9255#0#PHP" expanded="false" /> | ||
1146 | + <element signature="e#9411#11574#0#PHP" expanded="false" /> | ||
1147 | + <element signature="e#10493#11574#0#PHP" expanded="false" /> | ||
1148 | + <element signature="e#11650#12101#0#PHP" expanded="false" /> | ||
1149 | + <element signature="e#12178#13222#0#PHP" expanded="false" /> | ||
1150 | + <element signature="e#16139#16559#0#PHP" expanded="false" /> | ||
1151 | + <element signature="e#16564#26588#0#PHP" expanded="false" /> | ||
1152 | + <element signature="e#26605#26902#0#PHP" expanded="false" /> | ||
1153 | + <element signature="e#26907#27300#0#PHP" expanded="false" /> | ||
1154 | + <element signature="e#27327#30805#0#PHP" expanded="false" /> | ||
1155 | + <element signature="e#30834#33739#0#PHP" expanded="false" /> | ||
1156 | + <element signature="e#33772#39724#0#PHP" expanded="false" /> | ||
1157 | + <element signature="e#34571#35563#0#PHP" expanded="false" /> | ||
1158 | + <element signature="e#35609#39114#0#PHP" expanded="false" /> | ||
1159 | + <element signature="e#37688#38075#0#PHP" expanded="false" /> | ||
1160 | + <element signature="e#38136#39092#0#PHP" expanded="false" /> | ||
1161 | + <element signature="e#39162#39264#0#PHP" expanded="false" /> | ||
1162 | + <element signature="e#39753#46925#0#PHP" expanded="false" /> | ||
1163 | + <element signature="e#46948#47165#0#PHP" expanded="false" /> | ||
1152 | </folding> | 1164 | </folding> |
1153 | </state> | 1165 | </state> |
1154 | </provider> | 1166 | </provider> |
@@ -166,9 +166,11 @@ class Pay extends Api | @@ -166,9 +166,11 @@ class Pay extends Api | ||
166 | $this->error(['code'=>2,'msg'=>'openid不能为空']); | 166 | $this->error(['code'=>2,'msg'=>'openid不能为空']); |
167 | } | 167 | } |
168 | $data = Db::name('order')->where('id',$order_id)->find(); | 168 | $data = Db::name('order')->where('id',$order_id)->find(); |
169 | - $pic_id = explode(',',$data['pic_id']); | 169 | + $pic_id = []; |
170 | + if($data['pic_id']){ | ||
171 | + $pic_id = explode(',',$data['pic_id']); | ||
172 | + } | ||
170 | $video_id = unserialize($data['video_id']); | 173 | $video_id = unserialize($data['video_id']); |
171 | - | ||
172 | //查询用户表 取出手机号 | 174 | //查询用户表 取出手机号 |
173 | $user = Db::name('user')->where('id',$data['user_id'])->find(); | 175 | $user = Db::name('user')->where('id',$data['user_id'])->find(); |
174 | $mobile = $user['mobile']; | 176 | $mobile = $user['mobile']; |
-
请 注册 或 登录 后发表评论