郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 0e5866e265b269abcf7e21bd0a95e38465386dfa 1 个父辈 22160ee8
1 个管道 的构建 通过 耗费 4 秒

修改后台

内嵌 并排对比
正在显示 4 个修改的文件 包含 205 行增加 和 141 行删除
@@ -3,7 +3,9 @@ @@ -3,7 +3,9 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
7 </list> 9 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -25,34 +27,78 @@ @@ -25,34 +27,78 @@
25 </component> 27 </component>
26 <component name="FileEditorManager"> 28 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="PayController.php" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
30 - <provider selected="true" editor-type-id="text-editor">  
31 - <state relative-caret-position="1469">  
32 - <caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />  
33 - <folding>  
34 - <element signature="e#947#1011#0#PHP" expanded="false" />  
35 - <element signature="e#1016#1849#0#PHP" expanded="false" />  
36 - </folding>  
37 - </state>  
38 - </provider>  
39 - </entry>  
40 - </file>  
41 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">  
42 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 30 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
  31 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
43 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
44 - <state relative-caret-position="506">  
45 - <caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" /> 33 + <state relative-caret-position="77">
  34 + <caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
46 <folding> 35 <folding>
47 - <element signature="e#336#608#0#PHP" expanded="false" />  
48 - <element signature="e#614#976#0#PHP" expanded="false" />  
49 - <element signature="e#981#2020#0#PHP" expanded="false" />  
50 - <element signature="e#2026#2263#0#PHP" expanded="false" />  
51 - <element signature="e#3055#3364#0#PHP" expanded="false" />  
52 - <element signature="e#3369#5259#0#PHP" expanded="false" />  
53 - <element signature="e#5267#5746#0#PHP" expanded="false" />  
54 - <element signature="e#5751#6318#0#PHP" expanded="false" />  
55 - <element signature="e#6324#6577#0#PHP" expanded="false" /> 36 + <element signature="e#366#791#0#PHP" expanded="false" />
  37 + <element signature="e#796#1608#0#PHP" expanded="false" />
  38 + <element signature="e#1614#1872#0#PHP" expanded="false" />
  39 + <element signature="e#1877#2260#0#PHP" expanded="false" />
  40 + <element signature="e#2266#2495#0#PHP" expanded="false" />
  41 + <element signature="e#2500#4135#0#PHP" expanded="false" />
  42 + <element signature="e#4141#4381#0#PHP" expanded="false" />
  43 + <element signature="e#4386#4621#0#PHP" expanded="false" />
  44 + <element signature="e#4627#4974#0#PHP" expanded="false" />
  45 + <element signature="e#4979#5425#0#PHP" expanded="false" />
  46 + <element signature="e#5431#5691#0#PHP" expanded="false" />
  47 + <element signature="e#5696#5897#0#PHP" expanded="false" />
  48 + <element signature="e#5903#6165#0#PHP" expanded="false" />
  49 + <element signature="e#6170#6375#0#PHP" expanded="false" />
  50 + <element signature="e#6381#6860#0#PHP" expanded="false" />
  51 + <element signature="e#6865#9088#0#PHP" expanded="false" />
  52 + <element signature="e#9111#9642#0#PHP" expanded="false" />
  53 + <element signature="e#9648#9928#0#PHP" expanded="false" />
  54 + <element signature="e#9933#10325#0#PHP" expanded="false" />
  55 + <element signature="e#10331#10615#0#PHP" expanded="false" />
  56 + <element signature="e#10620#11565#0#PHP" expanded="false" />
  57 + <element signature="e#11571#11859#0#PHP" expanded="false" />
  58 + <element signature="e#11864#12803#0#PHP" expanded="false" />
  59 + <element signature="e#12809#13390#0#PHP" expanded="false" />
  60 + <element signature="e#13395#15063#0#PHP" expanded="false" />
  61 + <element signature="e#15069#15525#0#PHP" expanded="false" />
  62 + <element signature="e#15530#17598#0#PHP" expanded="false" />
  63 + <element signature="e#17621#17976#0#PHP" expanded="false" />
  64 + <element signature="e#17982#18695#0#PHP" expanded="false" />
  65 + <element signature="e#18700#20157#0#PHP" expanded="false" />
  66 + <element signature="e#20163#20624#0#PHP" expanded="false" />
  67 + <element signature="e#20629#23756#0#PHP" expanded="false" />
  68 + <element signature="e#23762#24371#0#PHP" expanded="false" />
  69 + <element signature="e#24376#25661#0#PHP" expanded="false" />
  70 + <element signature="e#25667#26024#0#PHP" expanded="false" />
  71 + <element signature="e#26029#27012#0#PHP" expanded="false" />
  72 + <element signature="e#27018#27370#0#PHP" expanded="false" />
  73 + <element signature="e#27375#28484#0#PHP" expanded="false" />
  74 + <element signature="e#28490#28845#0#PHP" expanded="false" />
  75 + <element signature="e#28850#30277#0#PHP" expanded="false" />
  76 + <element signature="e#30283#30707#0#PHP" expanded="false" />
  77 + <element signature="e#30712#31323#0#PHP" expanded="false" />
  78 + <element signature="e#31329#31825#0#PHP" expanded="false" />
  79 + <element signature="e#31830#35192#0#PHP" expanded="false" />
  80 + <element signature="e#32632#33759#0#PHP" expanded="false" />
  81 + <element signature="e#35198#35482#0#PHP" expanded="false" />
  82 + <element signature="e#35487#36123#0#PHP" expanded="false" />
  83 + <element signature="e#36144#36463#0#PHP" expanded="false" />
  84 + <element signature="e#36469#36877#0#PHP" expanded="false" />
  85 + <element signature="e#36883#37642#0#PHP" expanded="false" />
  86 + <element signature="e#37661#38525#0#PHP" expanded="false" />
  87 + <element signature="e#38551#38951#0#PHP" expanded="false" />
  88 + <element signature="e#38974#39547#0#PHP" expanded="false" />
  89 + <element signature="e#39570#40380#0#PHP" expanded="false" />
  90 + <element signature="e#40386#40985#0#PHP" expanded="false" />
  91 + <element signature="e#40990#41954#0#PHP" expanded="false" />
  92 + <element signature="e#41960#42627#0#PHP" expanded="false" />
  93 + <element signature="e#42632#43673#0#PHP" expanded="false" />
  94 + <element signature="e#43679#44342#0#PHP" expanded="false" />
  95 + <element signature="e#44347#45374#0#PHP" expanded="false" />
  96 + <element signature="e#45381#45812#0#PHP" expanded="false" />
  97 + <element signature="e#45817#46395#0#PHP" expanded="false" />
  98 + <element signature="e#46401#46830#0#PHP" expanded="false" />
  99 + <element signature="e#46835#47437#0#PHP" expanded="false" />
  100 + <element signature="e#47443#47870#0#PHP" expanded="false" />
  101 + <element signature="e#47875#48441#0#PHP" expanded="false" />
56 </folding> 102 </folding>
57 </state> 103 </state>
58 </provider> 104 </provider>
@@ -78,9 +124,6 @@ @@ -78,9 +124,6 @@
78 <component name="IdeDocumentHistory"> 124 <component name="IdeDocumentHistory">
79 <option name="CHANGED_PATHS"> 125 <option name="CHANGED_PATHS">
80 <list> 126 <list>
81 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html" />  
82 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/edit.html" />  
83 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/pay.html" />  
84 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" /> 127 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" />
85 <option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" /> 128 <option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />
86 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" /> 129 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
@@ -127,8 +170,11 @@ @@ -127,8 +170,11 @@
127 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 170 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
128 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 171 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
129 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 172 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
130 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
131 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 173 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  174 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
  175 + <option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
  176 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
  177 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
132 </list> 178 </list>
133 </option> 179 </option>
134 </component> 180 </component>
@@ -146,11 +192,11 @@ @@ -146,11 +192,11 @@
146 <sorting>DEFINITION_ORDER</sorting> 192 <sorting>DEFINITION_ORDER</sorting>
147 </component> 193 </component>
148 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 194 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
149 - <component name="ProjectFrameBounds" extendedState="1">  
150 - <option name="x" value="278" />  
151 - <option name="y" value="124" /> 195 + <component name="ProjectFrameBounds" extendedState="7">
  196 + <option name="x" value="197" />
  197 + <option name="y" value="-17" />
152 <option name="width" value="1618" /> 198 <option name="width" value="1618" />
153 - <option name="height" value="1007" /> 199 + <option name="height" value="1067" />
154 </component> 200 </component>
155 <component name="ProjectView"> 201 <component name="ProjectView">
156 <navigator currentView="ProjectPane" proportions="" version="1"> 202 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -180,19 +226,6 @@ @@ -180,19 +226,6 @@
180 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 226 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
181 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 227 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
182 </path> 228 </path>
183 - <path>  
184 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
185 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
186 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
187 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
188 - </path>  
189 - <path>  
190 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
191 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
192 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
193 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
194 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />  
195 - </path>  
196 </expand> 229 </expand>
197 <select /> 230 <select />
198 </subPane> 231 </subPane>
@@ -309,18 +342,17 @@ @@ -309,18 +342,17 @@
309 <workItem from="1576049946357" duration="1233000" /> 342 <workItem from="1576049946357" duration="1233000" />
310 <workItem from="1576056936489" duration="7947000" /> 343 <workItem from="1576056936489" duration="7947000" />
311 <workItem from="1576066696521" duration="5462000" /> 344 <workItem from="1576066696521" duration="5462000" />
312 - <workItem from="1576110549014" duration="6334000" /> 345 + <workItem from="1576110549014" duration="8980000" />
313 </task> 346 </task>
314 <servers /> 347 <servers />
315 </component> 348 </component>
316 <component name="TimeTrackingManager"> 349 <component name="TimeTrackingManager">
317 - <option name="totallyTimeSpent" value="549609000" /> 350 + <option name="totallyTimeSpent" value="552255000" />
318 </component> 351 </component>
319 <component name="ToolWindowManager"> 352 <component name="ToolWindowManager">
320 - <frame x="278" y="124" width="1618" height="1007" extended-state="1" />  
321 - <editor active="true" /> 353 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
322 <layout> 354 <layout>
323 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21116817" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 355 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17537314" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
324 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 356 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
325 <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="7" side_tool="true" content_ui="tabs" /> 357 <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="7" side_tool="true" content_ui="tabs" />
326 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 358 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -371,25 +403,6 @@ @@ -371,25 +403,6 @@
371 <watches-manager /> 403 <watches-manager />
372 </component> 404 </component>
373 <component name="editorHistoryManager"> 405 <component name="editorHistoryManager">
374 - <entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg">  
375 - <provider selected="true" editor-type-id="images">  
376 - <state />  
377 - </provider>  
378 - </entry>  
379 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">  
380 - <provider selected="true" editor-type-id="text-editor">  
381 - <state relative-caret-position="268">  
382 - <caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />  
383 - </state>  
384 - </provider>  
385 - </entry>  
386 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">  
387 - <provider selected="true" editor-type-id="text-editor">  
388 - <state relative-caret-position="-450">  
389 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
390 - </state>  
391 - </provider>  
392 - </entry>  
393 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html"> 406 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">
394 <provider selected="true" editor-type-id="text-editor"> 407 <provider selected="true" editor-type-id="text-editor">
395 <state relative-caret-position="125"> 408 <state relative-caret-position="125">
@@ -446,13 +459,6 @@ @@ -446,13 +459,6 @@
446 </state> 459 </state>
447 </provider> 460 </provider>
448 </entry> 461 </entry>
449 - <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">  
450 - <provider selected="true" editor-type-id="text-editor">  
451 - <state relative-caret-position="575">  
452 - <caret line="89" column="5" lean-forward="false" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="58" />  
453 - </state>  
454 - </provider>  
455 - </entry>  
456 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html"> 462 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
457 <provider selected="true" editor-type-id="text-editor"> 463 <provider selected="true" editor-type-id="text-editor">
458 <state relative-caret-position="-6"> 464 <state relative-caret-position="-6">
@@ -602,6 +608,7 @@ @@ -602,6 +608,7 @@
602 <provider selected="true" editor-type-id="text-editor"> 608 <provider selected="true" editor-type-id="text-editor">
603 <state relative-caret-position="400"> 609 <state relative-caret-position="400">
604 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> 610 <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
  611 + <folding />
605 </state> 612 </state>
606 </provider> 613 </provider>
607 </entry> 614 </entry>
@@ -623,6 +630,10 @@ @@ -623,6 +630,10 @@
623 <provider selected="true" editor-type-id="text-editor"> 630 <provider selected="true" editor-type-id="text-editor">
624 <state relative-caret-position="300"> 631 <state relative-caret-position="300">
625 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> 632 <caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
  633 + <folding>
  634 + <element signature="e#130#169#0#PHP" expanded="false" />
  635 + <element signature="e#262#1148#0#PHP" expanded="false" />
  636 + </folding>
626 </state> 637 </state>
627 </provider> 638 </provider>
628 </entry> 639 </entry>
@@ -685,13 +696,99 @@ @@ -685,13 +696,99 @@
685 </state> 696 </state>
686 </provider> 697 </provider>
687 </entry> 698 </entry>
  699 + <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
  700 + <provider selected="true" editor-type-id="text-editor">
  701 + <state relative-caret-position="425">
  702 + <caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
  703 + <folding>
  704 + <element signature="e#262#867#0#PHP" expanded="false" />
  705 + <element signature="e#2065#2422#0#PHP" expanded="false" />
  706 + <element signature="e#4089#4555#0#PHP" expanded="false" />
  707 + </folding>
  708 + </state>
  709 + </provider>
  710 + </entry>
  711 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
  712 + <provider selected="true" editor-type-id="text-editor">
  713 + <state relative-caret-position="0">
  714 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  715 + <folding>
  716 + <element signature="e#266#1001#0#PHP" expanded="false" />
  717 + <element signature="e#1016#2171#0#PHP" expanded="false" />
  718 + <element signature="e#2186#3928#0#PHP" expanded="false" />
  719 + <element signature="e#3943#4413#0#PHP" expanded="false" />
  720 + </folding>
  721 + </state>
  722 + </provider>
  723 + </entry>
  724 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  725 + <provider selected="true" editor-type-id="text-editor">
  726 + <state relative-caret-position="375">
  727 + <caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />
  728 + <folding>
  729 + <element signature="e#265#1638#0#PHP" expanded="false" />
  730 + <element signature="e#1655#3619#0#PHP" expanded="false" />
  731 + <element signature="e#3640#4059#0#PHP" expanded="false" />
  732 + </folding>
  733 + </state>
  734 + </provider>
  735 + </entry>
  736 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  737 + <provider selected="true" editor-type-id="text-editor">
  738 + <state relative-caret-position="506">
  739 + <caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />
  740 + <folding>
  741 + <element signature="e#336#608#0#PHP" expanded="false" />
  742 + <element signature="e#614#976#0#PHP" expanded="false" />
  743 + <element signature="e#981#2020#0#PHP" expanded="false" />
  744 + <element signature="e#2026#2263#0#PHP" expanded="false" />
  745 + <element signature="e#3055#3364#0#PHP" expanded="false" />
  746 + <element signature="e#3369#5259#0#PHP" expanded="false" />
  747 + <element signature="e#5267#5746#0#PHP" expanded="false" />
  748 + <element signature="e#5751#6318#0#PHP" expanded="false" />
  749 + <element signature="e#6324#6577#0#PHP" expanded="false" />
  750 + </folding>
  751 + </state>
  752 + </provider>
  753 + </entry>
  754 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  755 + <provider selected="true" editor-type-id="text-editor">
  756 + <state relative-caret-position="1469">
  757 + <caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
  758 + <folding>
  759 + <element signature="e#947#1011#0#PHP" expanded="false" />
  760 + <element signature="e#1016#1849#0#PHP" expanded="false" />
  761 + </folding>
  762 + </state>
  763 + </provider>
  764 + </entry>
  765 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  766 + <provider selected="true" editor-type-id="text-editor">
  767 + <state relative-caret-position="25">
  768 + <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
  769 + <folding>
  770 + <element signature="e#305#577#0#PHP" expanded="false" />
  771 + <element signature="e#583#854#0#PHP" expanded="false" />
  772 + <element signature="e#859#1113#0#PHP" expanded="false" />
  773 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  774 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  775 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  776 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  777 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  778 + <element signature="e#3894#4897#0#PHP" expanded="false" />
  779 + </folding>
  780 + </state>
  781 + </provider>
  782 + </entry>
688 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 783 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
689 <provider selected="true" editor-type-id="text-editor"> 784 <provider selected="true" editor-type-id="text-editor">
690 - <state relative-caret-position="360">  
691 - <caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" /> 785 + <state relative-caret-position="292">
  786 + <caret line="62" column="28" lean-forward="false" selection-start-line="62" selection-start-column="28" selection-end-line="62" selection-end-column="28" />
692 <folding> 787 <folding>
693 <element signature="e#411#604#0#PHP" expanded="false" /> 788 <element signature="e#411#604#0#PHP" expanded="false" />
694 <element signature="e#609#825#0#PHP" expanded="false" /> 789 <element signature="e#609#825#0#PHP" expanded="false" />
  790 + <element signature="e#831#1329#0#PHP" expanded="false" />
  791 + <element signature="e#1334#2093#0#PHP" expanded="false" />
695 <element signature="e#2099#2317#0#PHP" expanded="false" /> 792 <element signature="e#2099#2317#0#PHP" expanded="false" />
696 <element signature="e#2322#2530#0#PHP" expanded="false" /> 793 <element signature="e#2322#2530#0#PHP" expanded="false" />
697 <element signature="e#2536#3043#0#PHP" expanded="false" /> 794 <element signature="e#2536#3043#0#PHP" expanded="false" />
@@ -716,54 +813,50 @@ @@ -716,54 +813,50 @@
716 </state> 813 </state>
717 </provider> 814 </provider>
718 </entry> 815 </entry>
719 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 816 + <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
720 <provider selected="true" editor-type-id="text-editor"> 817 <provider selected="true" editor-type-id="text-editor">
721 - <state relative-caret-position="25">  
722 - <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> 818 + <state relative-caret-position="127">
  819 + <caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
723 <folding> 820 <folding>
724 - <element signature="e#305#577#0#PHP" expanded="false" />  
725 - <element signature="e#583#854#0#PHP" expanded="false" />  
726 - <element signature="e#859#1113#0#PHP" expanded="false" />  
727 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
728 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
729 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
730 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
731 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
732 - <element signature="e#3894#4897#0#PHP" expanded="false" /> 821 + <element signature="e#1401#1589#0#PHP" expanded="false" />
  822 + <element signature="e#1594#1885#0#PHP" expanded="false" />
  823 + <element signature="e#1891#2348#0#PHP" expanded="false" />
733 </folding> 824 </folding>
734 </state> 825 </state>
735 </provider> 826 </provider>
736 </entry> 827 </entry>
737 - <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php"> 828 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
738 <provider selected="true" editor-type-id="text-editor"> 829 <provider selected="true" editor-type-id="text-editor">
739 - <state relative-caret-position="425">  
740 - <caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" /> 830 + <state relative-caret-position="518">
  831 + <caret line="123" column="21" lean-forward="false" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" />
  832 + <folding>
  833 + <element signature="e#275#1168#0#PHP" expanded="false" />
  834 + <element signature="e#1185#2077#0#PHP" expanded="false" />
  835 + <element signature="e#2098#3379#0#PHP" expanded="false" />
  836 + </folding>
741 </state> 837 </state>
742 </provider> 838 </provider>
743 </entry> 839 </entry>
744 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php"> 840 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
745 <provider selected="true" editor-type-id="text-editor"> 841 <provider selected="true" editor-type-id="text-editor">
746 - <state relative-caret-position="0">  
747 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 842 + <state relative-caret-position="475">
  843 + <caret line="46" column="41" lean-forward="true" selection-start-line="46" selection-start-column="41" selection-end-line="46" selection-end-column="41" />
  844 + <folding />
748 </state> 845 </state>
749 </provider> 846 </provider>
750 </entry> 847 </entry>
751 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php"> 848 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
752 <provider selected="true" editor-type-id="text-editor"> 849 <provider selected="true" editor-type-id="text-editor">
753 - <state relative-caret-position="375">  
754 - <caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />  
755 - <folding>  
756 - <element signature="e#265#1638#0#PHP" expanded="false" />  
757 - <element signature="e#1655#3619#0#PHP" expanded="false" />  
758 - <element signature="e#3640#4059#0#PHP" expanded="false" />  
759 - </folding> 850 + <state relative-caret-position="475">
  851 + <caret line="40" column="48" lean-forward="true" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" />
  852 + <folding />
760 </state> 853 </state>
761 </provider> 854 </provider>
762 </entry> 855 </entry>
763 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 856 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
764 <provider selected="true" editor-type-id="text-editor"> 857 <provider selected="true" editor-type-id="text-editor">
765 - <state relative-caret-position="1750">  
766 - <caret line="839" column="0" lean-forward="true" selection-start-line="839" selection-start-column="0" selection-end-line="839" selection-end-column="0" /> 858 + <state relative-caret-position="77">
  859 + <caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
767 <folding> 860 <folding>
768 <element signature="e#366#791#0#PHP" expanded="false" /> 861 <element signature="e#366#791#0#PHP" expanded="false" />
769 <element signature="e#796#1608#0#PHP" expanded="false" /> 862 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -835,34 +928,5 @@ @@ -835,34 +928,5 @@
835 </state> 928 </state>
836 </provider> 929 </provider>
837 </entry> 930 </entry>
838 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
839 - <provider selected="true" editor-type-id="text-editor">  
840 - <state relative-caret-position="1469">  
841 - <caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />  
842 - <folding>  
843 - <element signature="e#947#1011#0#PHP" expanded="false" />  
844 - <element signature="e#1016#1849#0#PHP" expanded="false" />  
845 - </folding>  
846 - </state>  
847 - </provider>  
848 - </entry>  
849 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
850 - <provider selected="true" editor-type-id="text-editor">  
851 - <state relative-caret-position="506">  
852 - <caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />  
853 - <folding>  
854 - <element signature="e#336#608#0#PHP" expanded="false" />  
855 - <element signature="e#614#976#0#PHP" expanded="false" />  
856 - <element signature="e#981#2020#0#PHP" expanded="false" />  
857 - <element signature="e#2026#2263#0#PHP" expanded="false" />  
858 - <element signature="e#3055#3364#0#PHP" expanded="false" />  
859 - <element signature="e#3369#5259#0#PHP" expanded="false" />  
860 - <element signature="e#5267#5746#0#PHP" expanded="false" />  
861 - <element signature="e#5751#6318#0#PHP" expanded="false" />  
862 - <element signature="e#6324#6577#0#PHP" expanded="false" />  
863 - </folding>  
864 - </state>  
865 - </provider>  
866 - </entry>  
867 </component> 931 </component>
868 </project> 932 </project>
@@ -120,7 +120,7 @@ class ProjectController extends AdminBaseController @@ -120,7 +120,7 @@ class ProjectController extends AdminBaseController
120 ->alias('a') 120 ->alias('a')
121 ->join('user b','a.user_id = b.id') 121 ->join('user b','a.user_id = b.id')
122 ->field('a.*,b.user_nickname') 122 ->field('a.*,b.user_nickname')
123 - ->where('id',$id) 123 + ->where('a.id',$id)
124 ->find(); 124 ->find();
125 $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : ''); 125 $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
126 $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : ''); 126 $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <td>{$vo.email}</td> 44 <td>{$vo.email}</td>
45 <td>{:date('Y-m-d H:i:s',$vo.create_time)}</td> 45 <td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
46 <td> 46 <td>
47 - <a href='{:url("project/detail",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>| 47 + <a href='{:url("project/detail",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>
48 </td> 48 </td>
49 </tr> 49 </tr>
50 </foreach> 50 </foreach>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <tr> 46 <tr>
47 <th width="100">加盟信息</th> 47 <th width="100">加盟信息</th>
48 <td> 48 <td>
49 - <script type="text/plain">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script> 49 + {$data.content}
50 </td> 50 </td>
51 </tr> 51 </tr>
52 </table> 52 </table>