郭盛 / scrap · 提交

转到一个项目

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

修改后台

内嵌 并排对比
正在显示 4 个修改的文件 包含 205 行增加 和 141 行删除
... ... @@ -3,7 +3,9 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<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" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,34 +27,78 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="PayController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1469">
<caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
<state relative-caret-position="77">
<caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
<folding>
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />
<folding>
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#3055#3364#0#PHP" expanded="false" />
<element signature="e#3369#5259#0#PHP" expanded="false" />
<element signature="e#5267#5746#0#PHP" expanded="false" />
<element signature="e#5751#6318#0#PHP" expanded="false" />
<element signature="e#6324#6577#0#PHP" expanded="false" />
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
<element signature="e#1877#2260#0#PHP" expanded="false" />
<element signature="e#2266#2495#0#PHP" expanded="false" />
<element signature="e#2500#4135#0#PHP" expanded="false" />
<element signature="e#4141#4381#0#PHP" expanded="false" />
<element signature="e#4386#4621#0#PHP" expanded="false" />
<element signature="e#4627#4974#0#PHP" expanded="false" />
<element signature="e#4979#5425#0#PHP" expanded="false" />
<element signature="e#5431#5691#0#PHP" expanded="false" />
<element signature="e#5696#5897#0#PHP" expanded="false" />
<element signature="e#5903#6165#0#PHP" expanded="false" />
<element signature="e#6170#6375#0#PHP" expanded="false" />
<element signature="e#6381#6860#0#PHP" expanded="false" />
<element signature="e#6865#9088#0#PHP" expanded="false" />
<element signature="e#9111#9642#0#PHP" expanded="false" />
<element signature="e#9648#9928#0#PHP" expanded="false" />
<element signature="e#9933#10325#0#PHP" expanded="false" />
<element signature="e#10331#10615#0#PHP" expanded="false" />
<element signature="e#10620#11565#0#PHP" expanded="false" />
<element signature="e#11571#11859#0#PHP" expanded="false" />
<element signature="e#11864#12803#0#PHP" expanded="false" />
<element signature="e#12809#13390#0#PHP" expanded="false" />
<element signature="e#13395#15063#0#PHP" expanded="false" />
<element signature="e#15069#15525#0#PHP" expanded="false" />
<element signature="e#15530#17598#0#PHP" expanded="false" />
<element signature="e#17621#17976#0#PHP" expanded="false" />
<element signature="e#17982#18695#0#PHP" expanded="false" />
<element signature="e#18700#20157#0#PHP" expanded="false" />
<element signature="e#20163#20624#0#PHP" expanded="false" />
<element signature="e#20629#23756#0#PHP" expanded="false" />
<element signature="e#23762#24371#0#PHP" expanded="false" />
<element signature="e#24376#25661#0#PHP" expanded="false" />
<element signature="e#25667#26024#0#PHP" expanded="false" />
<element signature="e#26029#27012#0#PHP" expanded="false" />
<element signature="e#27018#27370#0#PHP" expanded="false" />
<element signature="e#27375#28484#0#PHP" expanded="false" />
<element signature="e#28490#28845#0#PHP" expanded="false" />
<element signature="e#28850#30277#0#PHP" expanded="false" />
<element signature="e#30283#30707#0#PHP" expanded="false" />
<element signature="e#30712#31323#0#PHP" expanded="false" />
<element signature="e#31329#31825#0#PHP" expanded="false" />
<element signature="e#31830#35192#0#PHP" expanded="false" />
<element signature="e#32632#33759#0#PHP" expanded="false" />
<element signature="e#35198#35482#0#PHP" expanded="false" />
<element signature="e#35487#36123#0#PHP" expanded="false" />
<element signature="e#36144#36463#0#PHP" expanded="false" />
<element signature="e#36469#36877#0#PHP" expanded="false" />
<element signature="e#36883#37642#0#PHP" expanded="false" />
<element signature="e#37661#38525#0#PHP" expanded="false" />
<element signature="e#38551#38951#0#PHP" expanded="false" />
<element signature="e#38974#39547#0#PHP" expanded="false" />
<element signature="e#39570#40380#0#PHP" expanded="false" />
<element signature="e#40386#40985#0#PHP" expanded="false" />
<element signature="e#40990#41954#0#PHP" expanded="false" />
<element signature="e#41960#42627#0#PHP" expanded="false" />
<element signature="e#42632#43673#0#PHP" expanded="false" />
<element signature="e#43679#44342#0#PHP" expanded="false" />
<element signature="e#44347#45374#0#PHP" expanded="false" />
<element signature="e#45381#45812#0#PHP" expanded="false" />
<element signature="e#45817#46395#0#PHP" expanded="false" />
<element signature="e#46401#46830#0#PHP" expanded="false" />
<element signature="e#46835#47437#0#PHP" expanded="false" />
<element signature="e#47443#47870#0#PHP" expanded="false" />
<element signature="e#47875#48441#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -78,9 +124,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/pay.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" />
<option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
... ... @@ -127,8 +170,11 @@
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -146,11 +192,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="278" />
<option name="y" value="124" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="197" />
<option name="y" value="-17" />
<option name="width" value="1618" />
<option name="height" value="1007" />
<option name="height" value="1067" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -180,19 +226,6 @@
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -309,18 +342,17 @@
<workItem from="1576049946357" duration="1233000" />
<workItem from="1576056936489" duration="7947000" />
<workItem from="1576066696521" duration="5462000" />
<workItem from="1576110549014" duration="6334000" />
<workItem from="1576110549014" duration="8980000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="549609000" />
<option name="totallyTimeSpent" value="552255000" />
</component>
<component name="ToolWindowManager">
<frame x="278" y="124" width="1618" height="1007" extended-state="1" />
<editor active="true" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21116817" sideWeight="0.5" order="0" 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.17537314" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" 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="7" 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.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
... ... @@ -371,25 +403,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
... ... @@ -446,13 +459,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="89" column="5" lean-forward="false" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6">
... ... @@ -602,6 +608,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -623,6 +630,10 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#130#169#0#PHP" expanded="false" />
<element signature="e#262#1148#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -685,13 +696,99 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
<folding>
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2065#2422#0#PHP" expanded="false" />
<element signature="e#4089#4555#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
<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>
<element signature="e#266#1001#0#PHP" expanded="false" />
<element signature="e#1016#2171#0#PHP" expanded="false" />
<element signature="e#2186#3928#0#PHP" expanded="false" />
<element signature="e#3943#4413#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />
<folding>
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#3055#3364#0#PHP" expanded="false" />
<element signature="e#3369#5259#0#PHP" expanded="false" />
<element signature="e#5267#5746#0#PHP" expanded="false" />
<element signature="e#5751#6318#0#PHP" expanded="false" />
<element signature="e#6324#6577#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1469">
<caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
<folding>
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="69" column="17" lean-forward="false" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" />
<state relative-caret-position="292">
<caret line="62" column="28" lean-forward="false" selection-start-line="62" selection-start-column="28" selection-end-line="62" selection-end-column="28" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2093#0#PHP" expanded="false" />
<element signature="e#2099#2317#0#PHP" expanded="false" />
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
... ... @@ -716,54 +813,50 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<state relative-caret-position="127">
<caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
<element signature="e#1401#1589#0#PHP" expanded="false" />
<element signature="e#1594#1885#0#PHP" expanded="false" />
<element signature="e#1891#2348#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="106" column="125" lean-forward="false" selection-start-line="106" selection-start-column="125" selection-end-line="106" selection-end-column="125" />
<state relative-caret-position="518">
<caret line="123" column="21" lean-forward="false" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" />
<folding>
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3379#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="475">
<caret line="46" column="41" lean-forward="true" selection-start-line="46" selection-start-column="41" selection-end-line="46" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="100" column="14" lean-forward="true" selection-start-line="100" selection-start-column="14" selection-end-line="100" selection-end-column="14" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3619#0#PHP" expanded="false" />
<element signature="e#3640#4059#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="475">
<caret line="40" column="48" lean-forward="true" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1750">
<caret line="839" column="0" lean-forward="true" selection-start-line="839" selection-start-column="0" selection-end-line="839" selection-end-column="0" />
<state relative-caret-position="77">
<caret line="421" column="38" lean-forward="false" selection-start-line="421" selection-start-column="38" selection-end-line="421" selection-end-column="38" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -835,34 +928,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1469">
<caret line="87" column="30" lean-forward="true" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="30" />
<folding>
<element signature="e#947#1011#0#PHP" expanded="false" />
<element signature="e#1016#1849#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="107" column="14" lean-forward="true" selection-start-line="107" selection-start-column="14" selection-end-line="107" selection-end-column="14" />
<folding>
<element signature="e#336#608#0#PHP" expanded="false" />
<element signature="e#614#976#0#PHP" expanded="false" />
<element signature="e#981#2020#0#PHP" expanded="false" />
<element signature="e#2026#2263#0#PHP" expanded="false" />
<element signature="e#3055#3364#0#PHP" expanded="false" />
<element signature="e#3369#5259#0#PHP" expanded="false" />
<element signature="e#5267#5746#0#PHP" expanded="false" />
<element signature="e#5751#6318#0#PHP" expanded="false" />
<element signature="e#6324#6577#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -120,7 +120,7 @@ class ProjectController extends AdminBaseController
->alias('a')
->join('user b','a.user_id = b.id')
->field('a.*,b.user_nickname')
->where('id',$id)
->where('a.id',$id)
->find();
$this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
$this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
... ...
... ... @@ -44,7 +44,7 @@
<td>{$vo.email}</td>
<td>{:date('Y-m-d H:i:s',$vo.create_time)}</td>
<td>
<a href='{:url("project/detail",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>|
<a href='{:url("project/detail",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>
</td>
</tr>
</foreach>
... ...
... ... @@ -46,7 +46,7 @@
<tr>
<th width="100">加盟信息</th>
<td>
<script type="text/plain">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script>
{$data.content}
</td>
</tr>
</table>
... ...