郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 78be8b94ceb88b85229e875b724c371c74e491f9 1 个父辈 7623a9b4
1 个管道 的构建 通过 耗费 11 秒

修改后台订单中授权书

内嵌 并排对比
正在显示 4 个修改的文件 包含 414 行增加 和 410 行删除
... ... @@ -2,19 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/order/shou.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" />
<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$/composer.json" afterPath="$PROJECT_DIR$/composer.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.lock" afterPath="$PROJECT_DIR$/composer.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_classmap.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_static.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_static.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/installed.json" afterPath="$PROJECT_DIR$/vendor/composer/installed.json" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -24,318 +15,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Common.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3275">
<caret line="148" column="38" lean-forward="false" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="38" />
<folding>
<element signature="e#1222#1271#0#PHP" expanded="false" />
<element signature="e#9935#10533#0#PHP" expanded="false" />
<element signature="e#10539#10616#0#PHP" expanded="false" />
<element signature="e#10621#14884#0#PHP" expanded="false" />
<marker date="1575893380581" expanded="true" signature="1639:9267" ph="..." />
<marker date="1575893380581" expanded="false" signature="1657:1792" ph="..." />
<marker date="1575893380581" expanded="false" signature="1677:1743" ph="..." />
<marker date="1575893380581" expanded="false" signature="1816:1863" ph="..." />
<marker date="1575893380581" expanded="false" signature="1864:1902" ph="..." />
<marker date="1575893380581" expanded="true" signature="1926:1973" ph="..." />
<marker date="1575893380581" expanded="true" signature="1974:2129" ph="..." />
<marker date="1575893380581" expanded="true" signature="2153:2172" ph="..." />
<marker date="1575893380581" expanded="true" signature="2173:3073" ph="..." />
<marker date="1575893380581" expanded="true" signature="2228:2275" ph="..." />
<marker date="1575893380581" expanded="true" signature="2228:2276" ph="..." />
<marker date="1575893380581" expanded="true" signature="2228:2311" ph="..." />
<marker date="1575893380581" expanded="false" signature="2261:2273" ph="..." />
<marker date="1575893380581" expanded="true" signature="2366:2414" ph="..." />
<marker date="1575893380581" expanded="true" signature="2366:2415" ph="..." />
<marker date="1575893380581" expanded="true" signature="2366:2449" ph="..." />
<marker date="1575893380581" expanded="false" signature="2400:2412" ph="..." />
<marker date="1575893380581" expanded="true" signature="2504:2551" ph="..." />
<marker date="1575893380581" expanded="true" signature="2504:2552" ph="..." />
<marker date="1575893380581" expanded="true" signature="2504:2586" ph="..." />
<marker date="1575893380581" expanded="false" signature="2537:2549" ph="..." />
<marker date="1575893380581" expanded="true" signature="2641:2689" ph="..." />
<marker date="1575893380581" expanded="true" signature="2641:2746" ph="..." />
<marker date="1575893380581" expanded="true" signature="2641:2787" ph="..." />
<marker date="1575893380581" expanded="true" signature="2675:2687" ph="..." />
<marker date="1575893380581" expanded="true" signature="2728:2744" ph="..." />
<marker date="1575893380581" expanded="true" signature="2842:2896" ph="..." />
<marker date="1575893380581" expanded="true" signature="2842:2932" ph="..." />
<marker date="1575893380581" expanded="false" signature="2883:2895" ph="..." />
<marker date="1575893380581" expanded="true" signature="2987:3056" ph="..." />
<marker date="1575893380581" expanded="false" signature="3097:3115" ph="..." />
<marker date="1575893380581" expanded="true" signature="3116:3533" ph="..." />
<marker date="1575893380581" expanded="false" signature="3144:3210" ph="..." />
<marker date="1575893380581" expanded="false" signature="3253:3298" ph="..." />
<marker date="1575893380581" expanded="true" signature="3300:3306" ph=" " />
<marker date="1575893380581" expanded="true" signature="3306:3312" ph=" " />
<marker date="1575893380581" expanded="true" signature="3312:3318" ph=" " />
<marker date="1575893380581" expanded="true" signature="3318:3324" ph=" " />
<marker date="1575893380581" expanded="false" signature="3343:3352" ph="..." />
<marker date="1575893380581" expanded="false" signature="3395:3404" ph="..." />
<marker date="1575893380581" expanded="false" signature="3433:3442" ph="..." />
<marker date="1575893380581" expanded="false" signature="3557:3575" ph="..." />
<marker date="1575893380581" expanded="true" signature="3576:3892" ph="..." />
<marker date="1575893380581" expanded="false" signature="3604:3670" ph="..." />
<marker date="1575893380581" expanded="false" signature="3709:3737" ph="..." />
<marker date="1575893380581" expanded="true" signature="3739:3745" ph=" " />
<marker date="1575893380581" expanded="true" signature="3745:3751" ph=" " />
<marker date="1575893380581" expanded="true" signature="3751:3757" ph=" " />
<marker date="1575893380581" expanded="true" signature="3757:3763" ph=" " />
<marker date="1575893380581" expanded="false" signature="3816:3825" ph="..." />
<marker date="1575893380581" expanded="false" signature="3916:3934" ph="..." />
<marker date="1575893380581" expanded="true" signature="3935:4294" ph="..." />
<marker date="1575893380581" expanded="false" signature="3963:4029" ph="..." />
<marker date="1575893380581" expanded="false" signature="4070:4115" ph="..." />
<marker date="1575893380581" expanded="false" signature="4117:4123" ph=" " />
<marker date="1575893380581" expanded="false" signature="4123:4129" ph=" " />
<marker date="1575893380581" expanded="false" signature="4129:4135" ph=" " />
<marker date="1575893380581" expanded="false" signature="4135:4141" ph=" " />
<marker date="1575893380581" expanded="false" signature="4224:4233" ph="..." />
<marker date="1575893380581" expanded="false" signature="4318:4365" ph="..." />
<marker date="1575893380581" expanded="false" signature="4367:4373" ph=" " />
<marker date="1575893380581" expanded="false" signature="4373:4379" ph=" " />
<marker date="1575893380581" expanded="false" signature="4379:4385" ph=" " />
<marker date="1575893380581" expanded="false" signature="4385:4391" ph=" " />
<marker date="1575893380581" expanded="false" signature="4446:4455" ph="..." />
<marker date="1575893380581" expanded="false" signature="4574:4621" ph="..." />
<marker date="1575893380581" expanded="false" signature="4623:4629" ph=" " />
<marker date="1575893380581" expanded="false" signature="4629:4635" ph=" " />
<marker date="1575893380581" expanded="false" signature="4635:4641" ph=" " />
<marker date="1575893380581" expanded="false" signature="4641:4647" ph=" " />
<marker date="1575893380581" expanded="false" signature="4701:4710" ph="..." />
<marker date="1575893380581" expanded="false" signature="4784:4800" ph="..." />
<marker date="1575893380581" expanded="false" signature="4853:4900" ph="..." />
<marker date="1575893380581" expanded="false" signature="4902:4908" ph=" " />
<marker date="1575893380581" expanded="false" signature="4908:4914" ph=" " />
<marker date="1575893380581" expanded="false" signature="4914:4920" ph=" " />
<marker date="1575893380581" expanded="false" signature="4920:4926" ph=" " />
<marker date="1575893380581" expanded="false" signature="4954:4980" ph="..." />
<marker date="1575893380581" expanded="false" signature="5066:5084" ph="..." />
<marker date="1575893380581" expanded="true" signature="5085:5683" ph="..." />
<marker date="1575893380581" expanded="false" signature="5113:5179" ph="..." />
<marker date="1575893380581" expanded="false" signature="5218:5265" ph="..." />
<marker date="1575893380581" expanded="false" signature="5267:5273" ph=" " />
<marker date="1575893380581" expanded="false" signature="5273:5279" ph=" " />
<marker date="1575893380581" expanded="false" signature="5279:5285" ph=" " />
<marker date="1575893380581" expanded="false" signature="5285:5291" ph=" " />
<marker date="1575893380581" expanded="false" signature="5376:5423" ph="..." />
<marker date="1575893380581" expanded="false" signature="5425:5431" ph=" " />
<marker date="1575893380581" expanded="false" signature="5431:5437" ph=" " />
<marker date="1575893380581" expanded="false" signature="5437:5443" ph=" " />
<marker date="1575893380581" expanded="false" signature="5443:5449" ph=" " />
<marker date="1575893380581" expanded="false" signature="5550:5597" ph="..." />
<marker date="1575893380581" expanded="false" signature="5599:5605" ph=" " />
<marker date="1575893380581" expanded="false" signature="5605:5611" ph=" " />
<marker date="1575893380581" expanded="false" signature="5611:5617" ph=" " />
<marker date="1575893380581" expanded="false" signature="5617:5623" ph=" " />
<marker date="1575893380581" expanded="false" signature="5707:5725" ph="..." />
<marker date="1575893380581" expanded="true" signature="5726:7409" ph="..." />
<marker date="1575893380581" expanded="false" signature="5754:5820" ph="..." />
<marker date="1575893380581" expanded="false" signature="5859:5906" ph="..." />
<marker date="1575893380581" expanded="false" signature="5908:5914" ph=" " />
<marker date="1575893380581" expanded="false" signature="5914:5920" ph=" " />
<marker date="1575893380581" expanded="false" signature="5920:5926" ph=" " />
<marker date="1575893380581" expanded="false" signature="5926:5932" ph=" " />
<marker date="1575893380581" expanded="false" signature="5958:5974" ph="..." />
<marker date="1575893380581" expanded="false" signature="6094:6141" ph="..." />
<marker date="1575893380581" expanded="false" signature="6143:6149" ph=" " />
<marker date="1575893380581" expanded="false" signature="6149:6155" ph=" " />
<marker date="1575893380581" expanded="false" signature="6155:6161" ph=" " />
<marker date="1575893380581" expanded="false" signature="6161:6167" ph=" " />
<marker date="1575893380581" expanded="false" signature="6319:6366" ph="..." />
<marker date="1575893380581" expanded="false" signature="6368:6374" ph=" " />
<marker date="1575893380581" expanded="false" signature="6374:6380" ph=" " />
<marker date="1575893380581" expanded="false" signature="6380:6386" ph=" " />
<marker date="1575893380581" expanded="false" signature="6386:6392" ph=" " />
<marker date="1575893380581" expanded="false" signature="6511:6558" ph="..." />
<marker date="1575893380581" expanded="false" signature="6560:6566" ph=" " />
<marker date="1575893380581" expanded="false" signature="6566:6572" ph=" " />
<marker date="1575893380581" expanded="false" signature="6572:6578" ph=" " />
<marker date="1575893380581" expanded="false" signature="6578:6584" ph=" " />
<marker date="1575893380581" expanded="false" signature="6668:6715" ph="..." />
<marker date="1575893380581" expanded="false" signature="6717:6723" ph=" " />
<marker date="1575893380581" expanded="false" signature="6723:6729" ph=" " />
<marker date="1575893380581" expanded="false" signature="6729:6735" ph=" " />
<marker date="1575893380581" expanded="false" signature="6735:6741" ph=" " />
<marker date="1575893380581" expanded="false" signature="6801:6848" ph="..." />
<marker date="1575893380581" expanded="false" signature="6850:6856" ph=" " />
<marker date="1575893380581" expanded="false" signature="6856:6862" ph=" " />
<marker date="1575893380581" expanded="false" signature="6862:6868" ph=" " />
<marker date="1575893380581" expanded="false" signature="6868:6874" ph=" " />
<marker date="1575893380581" expanded="false" signature="7058:7105" ph="..." />
<marker date="1575893380581" expanded="false" signature="7107:7113" ph=" " />
<marker date="1575893380581" expanded="false" signature="7113:7119" ph=" " />
<marker date="1575893380581" expanded="false" signature="7119:7125" ph=" " />
<marker date="1575893380581" expanded="false" signature="7125:7131" ph=" " />
<marker date="1575893380581" expanded="false" signature="7259:7306" ph="..." />
<marker date="1575893380581" expanded="false" signature="7308:7314" ph=" " />
<marker date="1575893380581" expanded="false" signature="7314:7320" ph=" " />
<marker date="1575893380581" expanded="false" signature="7320:7326" ph=" " />
<marker date="1575893380581" expanded="false" signature="7326:7332" ph=" " />
<marker date="1575893380581" expanded="false" signature="7433:7451" ph="..." />
<marker date="1575893380581" expanded="true" signature="7452:7952" ph="..." />
<marker date="1575893380581" expanded="false" signature="7480:7546" ph="..." />
<marker date="1575893380581" expanded="false" signature="7587:7634" ph="..." />
<marker date="1575893380581" expanded="false" signature="7636:7642" ph=" " />
<marker date="1575893380581" expanded="false" signature="7642:7648" ph=" " />
<marker date="1575893380581" expanded="false" signature="7648:7654" ph=" " />
<marker date="1575893380581" expanded="false" signature="7654:7660" ph=" " />
<marker date="1575893380581" expanded="false" signature="7772:7819" ph="..." />
<marker date="1575893380581" expanded="false" signature="7821:7827" ph=" " />
<marker date="1575893380581" expanded="false" signature="7827:7833" ph=" " />
<marker date="1575893380581" expanded="false" signature="7833:7839" ph=" " />
<marker date="1575893380581" expanded="false" signature="7839:7845" ph=" " />
<marker date="1575893380581" expanded="false" signature="7976:7994" ph="..." />
<marker date="1575893380581" expanded="true" signature="7995:8995" ph="..." />
<marker date="1575893380581" expanded="false" signature="8023:8089" ph="..." />
<marker date="1575893380581" expanded="false" signature="8128:8175" ph="..." />
<marker date="1575893380581" expanded="false" signature="8177:8183" ph=" " />
<marker date="1575893380581" expanded="false" signature="8183:8189" ph=" " />
<marker date="1575893380581" expanded="false" signature="8189:8195" ph=" " />
<marker date="1575893380581" expanded="false" signature="8195:8201" ph=" " />
<marker date="1575893380581" expanded="false" signature="8267:8314" ph="..." />
<marker date="1575893380581" expanded="false" signature="8316:8322" ph=" " />
<marker date="1575893380581" expanded="false" signature="8322:8328" ph=" " />
<marker date="1575893380581" expanded="false" signature="8328:8334" ph=" " />
<marker date="1575893380581" expanded="false" signature="8334:8340" ph=" " />
<marker date="1575893380581" expanded="false" signature="8397:8444" ph="..." />
<marker date="1575893380581" expanded="false" signature="8446:8452" ph=" " />
<marker date="1575893380581" expanded="false" signature="8452:8458" ph=" " />
<marker date="1575893380581" expanded="false" signature="8458:8464" ph=" " />
<marker date="1575893380581" expanded="false" signature="8464:8470" ph=" " />
<marker date="1575893380581" expanded="false" signature="8548:8595" ph="..." />
<marker date="1575893380581" expanded="false" signature="8597:8603" ph=" " />
<marker date="1575893380581" expanded="false" signature="8603:8609" ph=" " />
<marker date="1575893380581" expanded="false" signature="8609:8615" ph=" " />
<marker date="1575893380581" expanded="false" signature="8615:8621" ph=" " />
<marker date="1575893380581" expanded="false" signature="8714:8761" ph="..." />
<marker date="1575893380581" expanded="false" signature="8763:8769" ph=" " />
<marker date="1575893380581" expanded="false" signature="8769:8775" ph=" " />
<marker date="1575893380581" expanded="false" signature="8775:8781" ph=" " />
<marker date="1575893380581" expanded="false" signature="8781:8787" ph=" " />
<marker date="1575893380581" expanded="false" signature="8861:8908" ph="..." />
<marker date="1575893380581" expanded="false" signature="8910:8916" ph=" " />
<marker date="1575893380581" expanded="false" signature="8916:8922" ph=" " />
<marker date="1575893380581" expanded="false" signature="8922:8928" ph=" " />
<marker date="1575893380581" expanded="false" signature="8928:8934" ph=" " />
<marker date="1575893380581" expanded="false" signature="9019:9099" ph="..." />
<marker date="1575893380581" expanded="false" signature="9160:9240" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="composer.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="191">
<caret line="10" column="16" lean-forward="true" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<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="331">
<caret line="1766" column="0" lean-forward="true" selection-start-line="1766" selection-start-column="0" selection-end-line="1766" selection-end-column="0" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#1266#2890#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#5756#6104#0#PHP" expanded="false" />
<element signature="e#6110#6947#0#PHP" expanded="false" />
<element signature="e#6952#9147#0#PHP" expanded="false" />
<element signature="e#9153#9833#0#PHP" expanded="false" />
<element signature="e#9838#10691#0#PHP" expanded="false" />
<element signature="e#10697#11486#0#PHP" expanded="false" />
<element signature="e#11491#12839#0#PHP" expanded="false" />
<element signature="e#12845#13547#0#PHP" expanded="false" />
<element signature="e#13552#14752#0#PHP" expanded="false" />
<element signature="e#14758#15334#0#PHP" expanded="false" />
<element signature="e#15339#15900#0#PHP" expanded="false" />
<element signature="e#15906#16622#0#PHP" expanded="false" />
<element signature="e#16627#19053#0#PHP" expanded="false" />
<element signature="e#19059#19961#0#PHP" expanded="false" />
<element signature="e#19966#22792#0#PHP" expanded="false" />
<element signature="e#22798#23175#0#PHP" expanded="false" />
<element signature="e#23180#23501#0#PHP" expanded="false" />
<element signature="e#23507#24012#0#PHP" expanded="false" />
<element signature="e#24017#24268#0#PHP" expanded="false" />
<element signature="e#24274#24753#0#PHP" expanded="false" />
<element signature="e#24758#25515#0#PHP" expanded="false" />
<element signature="e#25521#26002#0#PHP" expanded="false" />
<element signature="e#26007#26777#0#PHP" expanded="false" />
<element signature="e#26783#27146#0#PHP" expanded="false" />
<element signature="e#27151#27342#0#PHP" expanded="false" />
<element signature="e#27348#27706#0#PHP" expanded="false" />
<element signature="e#27711#27902#0#PHP" expanded="false" />
<element signature="e#27908#29051#0#PHP" expanded="false" />
<element signature="e#29056#31721#0#PHP" expanded="false" />
<element signature="e#31727#32225#0#PHP" expanded="false" />
<element signature="e#32230#33976#0#PHP" expanded="false" />
<element signature="e#33982#34395#0#PHP" expanded="false" />
<element signature="e#34400#34879#0#PHP" expanded="false" />
<element signature="e#34885#35419#0#PHP" expanded="false" />
<element signature="e#35424#36809#0#PHP" expanded="false" />
<element signature="e#36815#37469#0#PHP" expanded="false" />
<element signature="e#37474#39489#0#PHP" expanded="false" />
<element signature="e#39495#40255#0#PHP" expanded="false" />
<element signature="e#40260#42969#0#PHP" expanded="false" />
<element signature="e#42995#43826#0#PHP" expanded="false" />
<element signature="e#43832#44252#0#PHP" expanded="false" />
<element signature="e#44257#44740#0#PHP" expanded="false" />
<element signature="e#44746#45552#0#PHP" expanded="false" />
<element signature="e#45557#48715#0#PHP" expanded="false" />
<element signature="e#48730#50065#0#PHP" expanded="false" />
<element signature="e#50081#51115#0#PHP" expanded="false" />
<element signature="e#51121#51879#0#PHP" expanded="false" />
<element signature="e#51884#55627#0#PHP" expanded="false" />
<element signature="e#55633#56025#0#PHP" expanded="false" />
<element signature="e#56030#56982#0#PHP" expanded="false" />
<element signature="e#57006#57579#0#PHP" expanded="false" />
<element signature="e#57585#58184#0#PHP" expanded="false" />
<element signature="e#58189#59116#0#PHP" expanded="false" />
<element signature="e#59122#59836#0#PHP" expanded="false" />
<element signature="e#59842#60269#0#PHP" expanded="false" />
<element signature="e#60274#60743#0#PHP" expanded="false" />
<element signature="e#60750#61955#0#PHP" expanded="false" />
<element signature="e#61960#63663#0#PHP" expanded="false" />
<element signature="e#62107#62446#1#PHP" expanded="false" />
<element signature="e#62476#62830#1#PHP" expanded="false" />
<element signature="e#63669#64535#0#PHP" expanded="false" />
<element signature="e#64540#66947#0#PHP" expanded="false" />
<element signature="e#64735#64872#1#PHP" expanded="false" />
<element signature="e#64902#65042#1#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Order.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="35" column="29" lean-forward="false" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="29" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<element signature="e#1200#3386#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -409,11 +89,11 @@
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/vendor/tecnickcom/tcpdf/examples/example_002.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/application/api/controller/Common.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/shou.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
</list>
</option>
</component>
... ... @@ -432,10 +112,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="286" />
<option name="y" value="168" />
<option name="x" value="352" />
<option name="y" value="72" />
<option name="width" value="1464" />
<option name="height" value="893" />
<option name="height" value="892" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -452,6 +132,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -468,36 +150,45 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="order" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -587,7 +278,8 @@
<workItem from="1575790089275" duration="377000" />
<workItem from="1575851041026" duration="14741000" />
<workItem from="1575874863361" duration="5705000" />
<workItem from="1575880737237" duration="11985000" />
<workItem from="1575880737237" duration="12885000" />
<workItem from="1575937244447" duration="2126000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -614,7 +306,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="372898000" />
<option name="totallyTimeSpent" value="375924000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -626,10 +318,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="286" y="168" width="1464" height="893" extended-state="1" />
<editor active="true" />
<frame x="352" y="72" width="1464" height="892" extended-state="1" />
<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.22222222" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22507122" 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.33" 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" />
... ... @@ -679,7 +370,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="20" />
<option name="time" value="21" />
</breakpoint-manager>
<watches-manager />
</component>
... ... @@ -907,7 +598,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4232">
<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>
... ... @@ -915,7 +605,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2543">
<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>
... ... @@ -923,9 +612,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2550">
<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>
<marker date="1575875584288" expanded="true" signature="3156:3167" ph="..." />
</folding>
</state>
</provider>
</entry>
... ... @@ -933,7 +619,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2007">
<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>
... ... @@ -941,7 +626,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2100">
<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>
... ... @@ -949,12 +633,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1300">
<caret line="67" column="16" lean-forward="true" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
<folding>
<marker date="1575876281832" expanded="false" signature="1889:1904" ph="..." />
<marker date="1575876281832" expanded="true" signature="1905:2064" ph="..." />
<marker date="1575876281832" expanded="false" signature="1923:1976" ph="..." />
<marker date="1575876281832" expanded="false" signature="2008:2042" ph="..." />
</folding>
</state>
</provider>
</entry>
... ... @@ -1005,7 +683,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="35" lean-forward="true" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1013,7 +690,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-225">
<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>
... ... @@ -1022,7 +698,6 @@
<state split_layout="SPLIT">
<first_editor 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 />
</first_editor>
<second_editor />
</state>
... ... @@ -1032,7 +707,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>
... ... @@ -1040,30 +714,236 @@
<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>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="43" column="10" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/shou.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
<caret line="12" column="14" lean-forward="true" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="191">
<caret line="10" column="16" lean-forward="true" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
<caret line="10" column="16" lean-forward="false" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1169">
<caret line="47" column="50" lean-forward="true" selection-start-line="47" selection-start-column="50" selection-end-line="47" selection-end-column="50" />
<state relative-caret-position="1125">
<caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<element signature="e#928#1752#0#PHP" expanded="false" />
<element signature="e#1759#11188#0#PHP" expanded="false" />
<element signature="e#2687#2736#0#PHP" expanded="false" />
<element signature="e#11221#13407#0#PHP" expanded="false" />
<marker date="1575939402265" expanded="true" signature="3104:10732" ph="..." />
<marker date="1575939402265" expanded="true" signature="3122:3257" ph="..." />
<marker date="1575939402265" expanded="false" signature="3142:3208" ph="..." />
<marker date="1575939402265" expanded="false" signature="3281:3328" ph="..." />
<marker date="1575939402265" expanded="true" signature="3329:3367" ph="..." />
<marker date="1575939402265" expanded="false" signature="3391:3438" ph="..." />
<marker date="1575939402265" expanded="true" signature="3439:3594" ph="..." />
<marker date="1575939402265" expanded="false" signature="3618:3637" ph="..." />
<marker date="1575939402265" expanded="true" signature="3638:4538" ph="..." />
<marker date="1575939402265" expanded="true" signature="3693:3776" ph="..." />
<marker date="1575939402265" expanded="false" signature="3726:3738" ph="..." />
<marker date="1575939402265" expanded="true" signature="3831:3914" ph="..." />
<marker date="1575939402265" expanded="false" signature="3865:3877" ph="..." />
<marker date="1575939402265" expanded="true" signature="3969:4051" ph="..." />
<marker date="1575939402265" expanded="false" signature="4002:4014" ph="..." />
<marker date="1575939402265" expanded="true" signature="4106:4252" ph="..." />
<marker date="1575939402265" expanded="false" signature="4140:4152" ph="..." />
<marker date="1575939402265" expanded="false" signature="4193:4209" ph="..." />
<marker date="1575939402265" expanded="true" signature="4307:4397" ph="..." />
<marker date="1575939402265" expanded="false" signature="4348:4360" ph="..." />
<marker date="1575939402265" expanded="true" signature="4452:4521" ph="..." />
<marker date="1575939402265" expanded="false" signature="4562:4580" ph="..." />
<marker date="1575939402265" expanded="true" signature="4581:4998" ph="..." />
<marker date="1575939402265" expanded="false" signature="4609:4675" ph="..." />
<marker date="1575939402265" expanded="false" signature="4718:4763" ph="..." />
<marker date="1575939402265" expanded="false" signature="4765:4771" ph=" " />
<marker date="1575939402265" expanded="false" signature="4771:4777" ph=" " />
<marker date="1575939402265" expanded="false" signature="4777:4783" ph=" " />
<marker date="1575939402265" expanded="false" signature="4783:4789" ph=" " />
<marker date="1575939402265" expanded="false" signature="4808:4817" ph="..." />
<marker date="1575939402265" expanded="false" signature="4860:4869" ph="..." />
<marker date="1575939402265" expanded="false" signature="4898:4907" ph="..." />
<marker date="1575939402265" expanded="false" signature="5022:5040" ph="..." />
<marker date="1575939402265" expanded="true" signature="5041:5357" ph="..." />
<marker date="1575939402265" expanded="false" signature="5069:5135" ph="..." />
<marker date="1575939402265" expanded="false" signature="5174:5202" ph="..." />
<marker date="1575939402265" expanded="false" signature="5204:5210" ph=" " />
<marker date="1575939402265" expanded="false" signature="5210:5216" ph=" " />
<marker date="1575939402265" expanded="false" signature="5216:5222" ph=" " />
<marker date="1575939402265" expanded="false" signature="5222:5228" ph=" " />
<marker date="1575939402265" expanded="false" signature="5281:5290" ph="..." />
<marker date="1575939402265" expanded="false" signature="5381:5399" ph="..." />
<marker date="1575939402265" expanded="true" signature="5400:5759" ph="..." />
<marker date="1575939402265" expanded="false" signature="5428:5494" ph="..." />
<marker date="1575939402265" expanded="false" signature="5535:5580" ph="..." />
<marker date="1575939402265" expanded="false" signature="5582:5588" ph=" " />
<marker date="1575939402265" expanded="false" signature="5588:5594" ph=" " />
<marker date="1575939402265" expanded="false" signature="5594:5600" ph=" " />
<marker date="1575939402265" expanded="false" signature="5600:5606" ph=" " />
<marker date="1575939402265" expanded="false" signature="5689:5698" ph="..." />
<marker date="1575939402265" expanded="false" signature="5783:5830" ph="..." />
<marker date="1575939402265" expanded="false" signature="5832:5838" ph=" " />
<marker date="1575939402265" expanded="false" signature="5838:5844" ph=" " />
<marker date="1575939402265" expanded="false" signature="5844:5850" ph=" " />
<marker date="1575939402265" expanded="false" signature="5850:5856" ph=" " />
<marker date="1575939402265" expanded="false" signature="5911:5920" ph="..." />
<marker date="1575939402265" expanded="false" signature="6039:6086" ph="..." />
<marker date="1575939402265" expanded="false" signature="6088:6094" ph=" " />
<marker date="1575939402265" expanded="false" signature="6094:6100" ph=" " />
<marker date="1575939402265" expanded="false" signature="6100:6106" ph=" " />
<marker date="1575939402265" expanded="false" signature="6106:6112" ph=" " />
<marker date="1575939402265" expanded="false" signature="6166:6175" ph="..." />
<marker date="1575939402265" expanded="false" signature="6249:6265" ph="..." />
<marker date="1575939402265" expanded="false" signature="6318:6365" ph="..." />
<marker date="1575939402265" expanded="false" signature="6367:6373" ph=" " />
<marker date="1575939402265" expanded="false" signature="6373:6379" ph=" " />
<marker date="1575939402265" expanded="false" signature="6379:6385" ph=" " />
<marker date="1575939402265" expanded="false" signature="6385:6391" ph=" " />
<marker date="1575939402265" expanded="false" signature="6419:6445" ph="..." />
<marker date="1575939402265" expanded="false" signature="6531:6549" ph="..." />
<marker date="1575939402265" expanded="true" signature="6550:7148" ph="..." />
<marker date="1575939402265" expanded="false" signature="6578:6644" ph="..." />
<marker date="1575939402265" expanded="false" signature="6683:6730" ph="..." />
<marker date="1575939402265" expanded="false" signature="6732:6738" ph=" " />
<marker date="1575939402265" expanded="false" signature="6738:6744" ph=" " />
<marker date="1575939402265" expanded="false" signature="6744:6750" ph=" " />
<marker date="1575939402265" expanded="false" signature="6750:6756" ph=" " />
<marker date="1575939402265" expanded="false" signature="6841:6888" ph="..." />
<marker date="1575939402265" expanded="false" signature="6890:6896" ph=" " />
<marker date="1575939402265" expanded="false" signature="6896:6902" ph=" " />
<marker date="1575939402265" expanded="false" signature="6902:6908" ph=" " />
<marker date="1575939402265" expanded="false" signature="6908:6914" ph=" " />
<marker date="1575939402265" expanded="false" signature="7015:7062" ph="..." />
<marker date="1575939402265" expanded="false" signature="7064:7070" ph=" " />
<marker date="1575939402265" expanded="false" signature="7070:7076" ph=" " />
<marker date="1575939402265" expanded="false" signature="7076:7082" ph=" " />
<marker date="1575939402265" expanded="false" signature="7082:7088" ph=" " />
<marker date="1575939402265" expanded="false" signature="7172:7190" ph="..." />
<marker date="1575939402265" expanded="true" signature="7191:8874" ph="..." />
<marker date="1575939402265" expanded="false" signature="7219:7285" ph="..." />
<marker date="1575939402265" expanded="false" signature="7324:7371" ph="..." />
<marker date="1575939402265" expanded="false" signature="7373:7379" ph=" " />
<marker date="1575939402265" expanded="false" signature="7379:7385" ph=" " />
<marker date="1575939402265" expanded="false" signature="7385:7391" ph=" " />
<marker date="1575939402265" expanded="false" signature="7391:7397" ph=" " />
<marker date="1575939402265" expanded="false" signature="7423:7439" ph="..." />
<marker date="1575939402265" expanded="false" signature="7559:7606" ph="..." />
<marker date="1575939402265" expanded="false" signature="7608:7614" ph=" " />
<marker date="1575939402265" expanded="false" signature="7614:7620" ph=" " />
<marker date="1575939402265" expanded="false" signature="7620:7626" ph=" " />
<marker date="1575939402265" expanded="false" signature="7626:7632" ph=" " />
<marker date="1575939402265" expanded="false" signature="7784:7831" ph="..." />
<marker date="1575939402265" expanded="false" signature="7833:7839" ph=" " />
<marker date="1575939402265" expanded="false" signature="7839:7845" ph=" " />
<marker date="1575939402265" expanded="false" signature="7845:7851" ph=" " />
<marker date="1575939402265" expanded="false" signature="7851:7857" ph=" " />
<marker date="1575939402265" expanded="false" signature="7976:8023" ph="..." />
<marker date="1575939402265" expanded="false" signature="8025:8031" ph=" " />
<marker date="1575939402265" expanded="false" signature="8031:8037" ph=" " />
<marker date="1575939402265" expanded="false" signature="8037:8043" ph=" " />
<marker date="1575939402265" expanded="false" signature="8043:8049" ph=" " />
<marker date="1575939402265" expanded="false" signature="8133:8180" ph="..." />
<marker date="1575939402265" expanded="false" signature="8182:8188" ph=" " />
<marker date="1575939402265" expanded="false" signature="8188:8194" ph=" " />
<marker date="1575939402265" expanded="false" signature="8194:8200" ph=" " />
<marker date="1575939402265" expanded="false" signature="8200:8206" ph=" " />
<marker date="1575939402265" expanded="false" signature="8266:8313" ph="..." />
<marker date="1575939402265" expanded="false" signature="8315:8321" ph=" " />
<marker date="1575939402265" expanded="false" signature="8321:8327" ph=" " />
<marker date="1575939402265" expanded="false" signature="8327:8333" ph=" " />
<marker date="1575939402265" expanded="false" signature="8333:8339" ph=" " />
<marker date="1575939402265" expanded="false" signature="8523:8570" ph="..." />
<marker date="1575939402265" expanded="false" signature="8572:8578" ph=" " />
<marker date="1575939402265" expanded="false" signature="8578:8584" ph=" " />
<marker date="1575939402265" expanded="false" signature="8584:8590" ph=" " />
<marker date="1575939402265" expanded="false" signature="8590:8596" ph=" " />
<marker date="1575939402265" expanded="false" signature="8724:8771" ph="..." />
<marker date="1575939402265" expanded="false" signature="8773:8779" ph=" " />
<marker date="1575939402265" expanded="false" signature="8779:8785" ph=" " />
<marker date="1575939402265" expanded="false" signature="8785:8791" ph=" " />
<marker date="1575939402265" expanded="false" signature="8791:8797" ph=" " />
<marker date="1575939402265" expanded="false" signature="8898:8916" ph="..." />
<marker date="1575939402265" expanded="true" signature="8917:9417" ph="..." />
<marker date="1575939402265" expanded="false" signature="8945:9011" ph="..." />
<marker date="1575939402265" expanded="false" signature="9052:9099" ph="..." />
<marker date="1575939402265" expanded="false" signature="9101:9107" ph=" " />
<marker date="1575939402265" expanded="false" signature="9107:9113" ph=" " />
<marker date="1575939402265" expanded="false" signature="9113:9119" ph=" " />
<marker date="1575939402265" expanded="false" signature="9119:9125" ph=" " />
<marker date="1575939402265" expanded="false" signature="9237:9284" ph="..." />
<marker date="1575939402265" expanded="false" signature="9286:9292" ph=" " />
<marker date="1575939402265" expanded="false" signature="9292:9298" ph=" " />
<marker date="1575939402265" expanded="false" signature="9298:9304" ph=" " />
<marker date="1575939402265" expanded="false" signature="9304:9310" ph=" " />
<marker date="1575939402265" expanded="false" signature="9441:9459" ph="..." />
<marker date="1575939402265" expanded="true" signature="9460:10460" ph="..." />
<marker date="1575939402265" expanded="false" signature="9488:9554" ph="..." />
<marker date="1575939402265" expanded="false" signature="9593:9640" ph="..." />
<marker date="1575939402265" expanded="false" signature="9642:9648" ph=" " />
<marker date="1575939402265" expanded="false" signature="9648:9654" ph=" " />
<marker date="1575939402265" expanded="false" signature="9654:9660" ph=" " />
<marker date="1575939402265" expanded="false" signature="9660:9666" ph=" " />
<marker date="1575939402265" expanded="false" signature="9732:9779" ph="..." />
<marker date="1575939402265" expanded="false" signature="9781:9787" ph=" " />
<marker date="1575939402265" expanded="false" signature="9787:9793" ph=" " />
<marker date="1575939402265" expanded="false" signature="9793:9799" ph=" " />
<marker date="1575939402265" expanded="false" signature="9799:9805" ph=" " />
<marker date="1575939402265" expanded="false" signature="9862:9909" ph="..." />
<marker date="1575939402265" expanded="false" signature="9911:9917" ph=" " />
<marker date="1575939402265" expanded="false" signature="9917:9923" ph=" " />
<marker date="1575939402265" expanded="false" signature="9923:9929" ph=" " />
<marker date="1575939402265" expanded="false" signature="9929:9935" ph=" " />
<marker date="1575939402265" expanded="false" signature="10013:10060" ph="..." />
<marker date="1575939402265" expanded="false" signature="10062:10068" ph=" " />
<marker date="1575939402265" expanded="false" signature="10068:10074" ph=" " />
<marker date="1575939402265" expanded="false" signature="10074:10080" ph=" " />
<marker date="1575939402265" expanded="false" signature="10080:10086" ph=" " />
<marker date="1575939402265" expanded="false" signature="10179:10226" ph="..." />
<marker date="1575939402265" expanded="false" signature="10228:10234" ph=" " />
<marker date="1575939402265" expanded="false" signature="10234:10240" ph=" " />
<marker date="1575939402265" expanded="false" signature="10240:10246" ph=" " />
<marker date="1575939402265" expanded="false" signature="10246:10252" ph=" " />
<marker date="1575939402265" expanded="false" signature="10326:10373" ph="..." />
<marker date="1575939402265" expanded="false" signature="10375:10381" ph=" " />
<marker date="1575939402265" expanded="false" signature="10381:10387" ph=" " />
<marker date="1575939402265" expanded="false" signature="10387:10393" ph=" " />
<marker date="1575939402265" expanded="false" signature="10393:10399" ph=" " />
<marker date="1575939402265" expanded="false" signature="10484:10564" ph="..." />
<marker date="1575939402265" expanded="false" signature="10625:10705" ph="..." />
</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="331">
<caret line="1766" column="0" lean-forward="true" selection-start-line="1766" selection-start-column="0" selection-end-line="1766" selection-end-column="0" />
<state relative-caret-position="231">
<caret line="1705" column="58" lean-forward="false" selection-start-line="1705" selection-start-column="58" selection-end-line="1705" selection-end-column="58" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -1135,27 +1015,23 @@
<element signature="e#62107#62446#1#PHP" expanded="false" />
<element signature="e#62476#62830#1#PHP" expanded="false" />
<element signature="e#63669#64535#0#PHP" expanded="false" />
<element signature="e#64540#66947#0#PHP" expanded="false" />
<element signature="e#64540#67161#0#PHP" expanded="false" />
<element signature="e#64735#64872#1#PHP" expanded="false" />
<element signature="e#64902#65042#1#PHP" expanded="false" />
<element signature="e#65712#65796#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="43" column="10" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3275">
<caret line="148" column="38" lean-forward="false" selection-start-line="148" selection-start-column="34" selection-end-line="148" selection-end-column="38" />
<state relative-caret-position="156">
<caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#294#9793#0#PHP" expanded="false" />
<element signature="e#1222#1271#0#PHP" expanded="false" />
<element signature="e#9799#9930#0#PHP" expanded="false" />
<element signature="e#9935#10533#0#PHP" expanded="false" />
<element signature="e#10539#10616#0#PHP" expanded="false" />
<element signature="e#10621#14884#0#PHP" expanded="false" />
... ... @@ -1351,24 +1227,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/shou.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
<caret line="12" column="14" lean-forward="true" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="35" column="29" lean-forward="false" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="29" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<element signature="e#1200#3386#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -49,9 +49,153 @@ class Order extends Backend
$data = Db::name('shou')
->where('order_id',$id)
->find();
$this->assign('data',$data);
return $this->view->fetch();
$createtime = date('Y-m-d H:i:s',$data['createtime']);
$num = Db::name('order')->where('id',$data['order_id'])->field('num')->find();
if(!empty($data['pic_id'])){
$number = Db::name('pic')->where('id',$data['pic_id'])->field('number')->find();
$this->test_pdf($data['name'],$data['use'],$data['tel'],$number['number'],$num['num'],$createtime);
}
if(!empty($data['video_id'])){
$number = Db::name('video')->where('id',$data['video_id'])->field('number')->find();
$this->test_pdf($data['name'],$data['use'],$data['tel'],$number['number'],$num['num'],$createtime);
}
}
public function test_pdf($name='',$use='',$tel='',$number='',$order_num='',$time='') {
// create new PDF document
$pdf = new \TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
// set document information
$pdf->SetCreator(PDF_CREATOR);
$pdf->SetAuthor('Nicola Asuni');
$pdf->SetTitle('TCPDF Example 002');
$pdf->SetSubject('TCPDF Tutorial');
$pdf->SetKeywords('TCPDF, PDF, example, test, guide');
// remove default header/footer
$pdf->setPrintHeader(false);
$pdf->setPrintFooter(false);
// set default monospaced font
$pdf->SetDefaultMonospacedFont(PDF_FONT_MONOSPACED);
// set margins
$pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
// set auto page breaks
$pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
// set image scale factor
$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
// set some language-dependent strings (optional)
// if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
// require_once(dirname(__FILE__).'/lang/eng.php');
// $pdf->setLanguageArray($l);
// }
// ---------------------------------------------------------
// set font
$pdf->SetFont('msyh', '', 20);
// add a page
$pdf->AddPage();
$test_title = ' <div>
<div
style="font-size: 28px;color: #333;text-align: center;margin-bottom: 30px"
>
素材使用授权书
</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">
亲爱的用户，您好
</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">
非常感谢您使用仁甲看见SHOP的相关素材,
本小程序内销售的素材均为仁甲看见拍摄的正版优质作品，为方便您能正当合法的使用本素材，避免日后因版权纠纷引起的不必要麻烦，请务必填写本授权书；我们会为您自动生成一个pdf文件发送给您；
</div>
<div style="margin-bottom: 30px">
<div class="font-size: 16px;color: #333;">
使用方为<span style="color:orange">【'.$name.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
使用用途为<span style="color:orange">【'.$use.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
联系方式<span style="color:orange">【'.$tel.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
素材编号为<span style="color:orange">【'.$number.'】</span>，订单编号为<span style="color:dodgerblue">【'.$order_num.'】</span>
</div>
<div class="font-size: 16px;color: #333;">
素材购买时间为【<span style="color:orange">'.$time.'</span>】
</div>
<div class="font-size: 16px;color: #333;">
本小程序所有的图片及视频素材拥有者为山东仁甲看见影像服务有限公司
</div>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于版权和使用权</div>
<div style="font-size: 16px;color: #333;font-weight: bold">&nbsp;&nbsp;&nbsp;&nbsp;您购买的素材<span style="color:red">仅限贵单位使用于本协议中的指定用途</span>，仅拥有<span style="color:red">使用权</span>，不包含<span style="color:red">版权及著作权等</span>；如若在其他项目中继续使用，须联系客服更新授权书（无限次免费），以避免日后出现的侵权事件造成的不必要麻烦。</div>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于物权</div>
<div style="font-size: 16px;color: #333;">&nbsp;&nbsp;&nbsp;&nbsp;此微信小程序中图片/视频涉及的拍摄目标主要针对城市景观，如果客户在使用过程中出现<span style="color:red">涉及物权纠纷的案例</span>，本公司及小程序概不负责。如果您介意此事，请慎重下单。</div>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于素材质量</div>
<div style="font-size: 16px;color: #333;font-weight: bold">&nbsp;&nbsp;&nbsp;&nbsp;素材拍摄使用的设备种类很多，本小程序内素材稳定性 分辨率 调色 光比等都会略有差别，建议您在下单购买之前认真查看小样，素材属于虚拟版权物品，<span style="color:red">一经售出概不接受任何理由的退换货</span>。如果您介意此事，请慎重下单</div>
</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;视频素材的分辨率在每个素材下方都有详细描述，2K 4K 8K有些部分素材尺寸并 <span style="color:red">非为国际常用标准的尺寸</span> ，比如部分8k素材实际分辨率为6K，建议您在下单购买之前仔细查看照片和视频下方关于分辨率的说明描述，以避免因为分辨率问题带来的困扰和麻烦。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;我们摆上货架的商品都是仁甲看见仔细筛选和挑选的优质素材，部分航拍延时素材可能存在 <span style="color:red">轻微抖动</span> 的问题，建议您在购买之前仔细查看预览视频及水印小样，以避免因为素材抖动问题带来的困扰和麻烦。 <span style="font-weight:bold">如果您介意此事，请慎重下单。</span> </div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;如果您在使用素材的过程中遇到 <span style="color:red;font-weight:bold">其他问题</span> 或是有更好的建议请联系客服，我们会在第一时间与您沟通确保素材的正常使用</span> </div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于义务</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;您应当严格遵守用户使用规范的相关规定，不得使用仁甲看见SHOP小程序的所有素材用于违法行为或其它非法目的</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;您不得利用此微信小程序素材丑化、诽谤、恶意抹黑山东仁甲看见影像服务有限公司的形象，或用于危害社会，侵蚀道德风尚，宣传不法邪教组织等内容。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;其他干扰仁甲看见SHOP小程序正常运营和侵犯其他用户或第三方合法权益的行为。</div>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于免责</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;您应当理解并同意，仁甲看见<span style="font-weight:bold">SHOP</span>小程序所展示的服务是以现有技术和素材原状提供的，所展示及销售的版权素材皆为最原始状态，由于您对本网站服务未尽了解或理解错误造成的损失不承担法律责任。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;您应当理解并同意,如果您无法判断所需内容是否需要额外的第三方授权，您有义务咨询专业人士的法律意见或与本公司相关部门进行确认，因您未尽到上述责任产生的任何第三方主张的索赔、要求或损失，您应当独立承担责任；本公司因此遭受损失的，您应当一并赔偿</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;您应当理解并同意，仁甲看见SHOP小程序不担保所提供的服务完全符合您的需要，对于可能遇到的网络信息带来的风险，不对其内容的准确性、真实性、正当性、合法性负责，包括但不限于：</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;1. 使用本服务过程中受到，遭人误导或理解错误导致或可能导致的任何心理、生理上的伤害以及其他经济损失；</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;2. 使用过程中造成的个人隐私泄露或其他信息安全风险；</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;您应当理解并同意，除法律不能豁免的责任外，本网站对您或通过您使用本网站或其内容的第三方，均不承担个人风险行为产生的责任，包括木马病毒、未能传送讯息、数据损坏、传输错误，或因使用互联网服务供应商，或因链接到第三方网站和第三方网站内容，而导致的任何损害，包括但不限于利润的损失、机会的损失或必然的损害赔偿。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 30px">&nbsp;&nbsp;&nbsp;&nbsp;您应当理解并同意，仁甲看见SHOP小程序不能随时预见和防范法律法规、技术以及其他风险，包括但不限于不可抗力、第三方瑕疵、黑客攻击、系统不稳定等可能导致服务中断、数据丢失以及其他的损失与风险。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;本公司依据协议约定取得处理违法违规行为的权利，但不构成义务或承诺，有权利但没有义务及时发现违法行为或进行处理。</div>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">关于产权保护</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;仁甲看见SHOP小程序的一切商标权、专利权、图片、视频等知识产权均受中华人民共和国法律法规和相应的国际条约保护，山东仁甲看见影像服务有限公司享有上述知识产权。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;未经山东仁甲看见影像服务有限公司或相关权利人书面同意，您不得为任何商业或非商业目的自行或许可任何第三方实施、利用、转让上述知识产权，也不得以任何形式进行或创造相关衍生作品</div>
</div>
<div style="margin-bottom:20px">
<div style="font-size: 16px;color: gray;margin-bottom: 20px;text-align: center">补充说明</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;本协议自发布之日起生效，直至本网站决定终止此协议或协议更新后终止。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;本协议签订地为中华人民共和国山东省青岛市李沧区。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;本协议的成立、生效、履行、解释及纠纷解决，适用中华人民共和国大陆地区法律（不包括冲突法）。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;若您和本网站发生任何纠纷或争议，首先应友好协商解决；协商不成的，您同意将纠纷或争议提交本协议签订地有管辖权的人民法院管辖</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;本协议所有条款的标题仅为阅读方便，本身并无实际涵义，不能作为本协议涵义解释的依据。</div>
<div style="font-size: 16px;color: #333;margin-bottom: 20px">&nbsp;&nbsp;&nbsp;&nbsp;本协议条款无论因何种原因部分无效或不可执行，其余条款仍有效，对双方具有约束力。</div>
</div>
<div style="color:red;font-size:16px;margin-bottom:20px;text-align: center;font-weight: bold">山东仁甲看见影像服务有限公司对于本协议所有条款拥有最终解释权</div>
<div style="color:red;font-size:16px;margin-bottom:20px;text-align: center;font-weight: bold">祝您使用愉快！！！</div>
</div>';
// output the HTML content
$pdf->MultiCell('', '', $test_title, $border=0, $align='J', $fill=0, $ln=1, $x='20', $y='20', $reseth=true, $stretch=0, $ishtml=true, $autopadding=true, $maxh=0);
// ---------------------------------------------------------
// ---------------------------------------------------------
//Close and output PDF document
$pdf->Output('example_002.pdf', 'D');
// var_dump($pdf);exit;
exit;
}
... ...
... ... @@ -1893,16 +1893,26 @@ class User extends Api
$res['use'] = $param['use'];
$res['tel'] = $param['tel'];
$res['createtime'] = time();
if(!empty($param['pic_id'])){
$res['pic_id'] = $param['pic_id'];
}
if(!empty($param['video_id'])){
$res['video_id'] = $param['video_id'];
}
//判断是否已经下载过授权书
$info = Db::name('shou')
->where('order_id',$res['order_id'])
->find();
if(!empty($info)){
$this->error(['code'=>2,'msg'=>'您已经下载过了']);
}
$data = Db::name('shou')
->insertGetId($res);
if(!empty($data)){
//添加成功
$list = Db::name('shou')
->where('id',$data)
->find();
... ... @@ -1911,18 +1921,18 @@ class User extends Api
->whereIn('id',$list['order_id'])
->update(['shou_status'=>1]);
$order = Db::name('order')->where('id',$list['order_id'])->find();
if(!empty($param['pic_id'])){
if(!empty($res['pic_id'])){
$pic = Db::name('pic')
->where('id',$param['pic_id'])
->where('id',$res['pic_id'])
->field('number')
->find();
$common = new Common();
$common->test_pdf($res['name'],$res['use'],$res['tel'],$pic['number'],$order['num'],$time);
$this->success('success');
}
if(!empty($param['video_id'])){
if(!empty($res['video_id'])){
$video = Db::name('video')
->where('id',$param['video_id'])
->where('id',$res['video_id'])
->field('number')
->find();
$common = new Common();
... ...
... ... @@ -45,16 +45,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
}
},
{
name: 'name2',
text: '授权书信息',
title: '授权书信息',
icon: 'fa fa-list',
classname: 'btn btn-xs btn-primary btn-dialog',
classname: 'btn btn-xs btn-primary',
url: 'order/shou',
extend: 'data-area=\'["80%","80%"]\'',
callback:function(data){
}
},
], operate:false, formatter: Table.api.formatter.buttons
},
... ...