郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 04f9cbf36b30fcbed5ad34b64b3ef1677bbb67d6 1 个父辈 8e41c4fd
1 个管道 的构建 通过 耗费 8 秒

添加环保知识

内嵌 并排对比
正在显示 7 个修改的文件 包含 496 行增加 和 109 行删除
@@ -2,10 +2,14 @@ @@ -2,10 +2,14 @@
2 <project version="4"> 2 <project version="4">
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/admin/controller/KnowController.php" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 7 <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" />  
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" /> 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" />
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/conf/route.php" afterPath="$PROJECT_DIR$/data/conf/route.php" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
9 </list> 13 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 14 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 15 <option name="TRACKING_ENABLED" value="true" />
@@ -27,22 +31,44 @@ @@ -27,22 +31,44 @@
27 </component> 31 </component>
28 <component name="FileEditorManager"> 32 <component name="FileEditorManager">
29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 33 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">  
31 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 34 + <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="true">
  35 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
32 <provider selected="true" editor-type-id="text-editor"> 36 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="419">  
34 - <caret line="154" column="54" lean-forward="false" selection-start-line="154" selection-start-column="54" selection-end-line="154" selection-end-column="54" /> 37 + <state relative-caret-position="1391">
  38 + <caret line="489" column="5" lean-forward="false" selection-start-line="489" selection-start-column="5" selection-end-line="489" selection-end-column="5" />
35 <folding> 39 <folding>
36 - <element signature="e#131#162#0#PHP" expanded="true" />  
37 - <element signature="e#330#602#0#PHP" expanded="false" />  
38 - <element signature="e#608#968#0#PHP" expanded="false" />  
39 - <element signature="e#973#1861#0#PHP" expanded="false" />  
40 - <element signature="e#1867#2104#0#PHP" expanded="false" />  
41 - <element signature="e#2109#2809#0#PHP" expanded="false" />  
42 - <element signature="e#2815#3057#0#PHP" expanded="false" />  
43 - <element signature="e#3063#3300#0#PHP" expanded="false" />  
44 - <element signature="e#3305#3377#0#PHP" expanded="false" />  
45 - <element signature="e#3383#3830#0#PHP" expanded="false" /> 40 + <element signature="e#321#575#0#PHP" expanded="false" />
  41 + <element signature="e#580#865#0#PHP" expanded="false" />
  42 + <element signature="e#871#1206#0#PHP" expanded="false" />
  43 + <element signature="e#1211#1708#0#PHP" expanded="false" />
  44 + <element signature="e#1714#1974#0#PHP" expanded="false" />
  45 + <element signature="e#1979#2268#0#PHP" expanded="false" />
  46 + <element signature="e#2274#2613#0#PHP" expanded="false" />
  47 + <element signature="e#2618#3121#0#PHP" expanded="false" />
  48 + <element signature="e#3127#3343#0#PHP" expanded="false" />
  49 + <element signature="e#3348#3717#0#PHP" expanded="false" />
  50 + <element signature="e#3723#4025#0#PHP" expanded="false" />
  51 + <element signature="e#4030#4429#0#PHP" expanded="false" />
  52 + <element signature="e#4435#4632#0#PHP" expanded="false" />
  53 + <element signature="e#4637#4894#0#PHP" expanded="false" />
  54 + <element signature="e#4900#5096#0#PHP" expanded="false" />
  55 + <element signature="e#5101#5363#0#PHP" expanded="false" />
  56 + <element signature="e#5369#5796#0#PHP" expanded="false" />
  57 + <element signature="e#5801#6358#0#PHP" expanded="false" />
  58 + <element signature="e#6364#6707#0#PHP" expanded="false" />
  59 + <element signature="e#6712#7193#0#PHP" expanded="false" />
  60 + <element signature="e#7199#7532#0#PHP" expanded="false" />
  61 + <element signature="e#7537#7892#0#PHP" expanded="false" />
  62 + <element signature="e#7898#8251#0#PHP" expanded="false" />
  63 + <element signature="e#8256#8661#0#PHP" expanded="false" />
  64 + <element signature="e#8667#9050#0#PHP" expanded="false" />
  65 + <element signature="e#9055#9722#0#PHP" expanded="false" />
  66 + <element signature="e#9728#10172#0#PHP" expanded="false" />
  67 + <element signature="e#10177#11024#0#PHP" expanded="false" />
  68 + <element signature="e#11030#11298#0#PHP" expanded="false" />
  69 + <element signature="e#11303#11775#0#PHP" expanded="false" />
  70 + <element signature="e#11781#12087#0#PHP" expanded="false" />
  71 + <element signature="e#12092#12809#0#PHP" expanded="false" />
46 </folding> 72 </folding>
47 </state> 73 </state>
48 </provider> 74 </provider>
@@ -68,8 +94,6 @@ @@ -68,8 +94,6 @@
68 <component name="IdeDocumentHistory"> 94 <component name="IdeDocumentHistory">
69 <option name="CHANGED_PATHS"> 95 <option name="CHANGED_PATHS">
70 <list> 96 <list>
71 - <option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" />  
72 - <option value="$PROJECT_DIR$/app/index/controller/DoorController.php" />  
73 <option value="$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php" /> 97 <option value="$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php" />
74 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 98 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
75 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html" /> 99 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html" />
@@ -100,10 +124,8 @@ @@ -100,10 +124,8 @@
100 <option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" /> 124 <option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />
101 <option value="$PROJECT_DIR$/api/index/model/ShoppicModel.php" /> 125 <option value="$PROJECT_DIR$/api/index/model/ShoppicModel.php" />
102 <option value="$PROJECT_DIR$/app/admin/controller/BuildController.php" /> 126 <option value="$PROJECT_DIR$/app/admin/controller/BuildController.php" />
103 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />  
104 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 127 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
105 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 128 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
106 - <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />  
107 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" /> 129 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
108 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html" /> 130 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html" />
109 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html" /> 131 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html" />
@@ -117,8 +139,12 @@ @@ -117,8 +139,12 @@
117 <option value="$PROJECT_DIR$/api/config.php" /> 139 <option value="$PROJECT_DIR$/api/config.php" />
118 <option value="$PROJECT_DIR$/app/config.php" /> 140 <option value="$PROJECT_DIR$/app/config.php" />
119 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 141 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
120 - <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />  
121 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 142 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  143 + <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
  144 + <option value="$PROJECT_DIR$/app/admin/controller/KnowController.php" />
  145 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html" />
  146 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
  147 + <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
122 </list> 148 </list>
123 </option> 149 </option>
124 </component> 150 </component>
@@ -136,11 +162,11 @@ @@ -136,11 +162,11 @@
136 <sorting>DEFINITION_ORDER</sorting> 162 <sorting>DEFINITION_ORDER</sorting>
137 </component> 163 </component>
138 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 164 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
139 - <component name="ProjectFrameBounds">  
140 - <option name="x" value="480" />  
141 - <option name="y" value="69" /> 165 + <component name="ProjectFrameBounds" extendedState="1">
  166 + <option name="x" value="82" />
  167 + <option name="y" value="37" />
142 <option name="width" value="1935" /> 168 <option name="width" value="1935" />
143 - <option name="height" value="1006" /> 169 + <option name="height" value="1003" />
144 </component> 170 </component>
145 <component name="ProjectView"> 171 <component name="ProjectView">
146 <navigator currentView="ProjectPane" proportions="" version="1"> 172 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -192,7 +218,7 @@ @@ -192,7 +218,7 @@
192 </component> 218 </component>
193 <component name="PropertiesComponent"> 219 <component name="PropertiesComponent">
194 <property name="WebServerToolWindowFactoryState" value="false" /> 220 <property name="WebServerToolWindowFactoryState" value="false" />
195 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 221 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project1/resource" />
196 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 222 <property name="DefaultHtmlFileTemplate" value="HTML File" />
197 </component> 223 </component>
198 <component name="RecentsManager"> 224 <component name="RecentsManager">
@@ -261,18 +287,17 @@ @@ -261,18 +287,17 @@
261 <workItem from="1573690800296" duration="20605000" /> 287 <workItem from="1573690800296" duration="20605000" />
262 <workItem from="1573724518247" duration="1337000" /> 288 <workItem from="1573724518247" duration="1337000" />
263 <workItem from="1573726096905" duration="2420000" /> 289 <workItem from="1573726096905" duration="2420000" />
264 - <workItem from="1573780685042" duration="2872000" /> 290 + <workItem from="1573780685042" duration="12526000" />
265 </task> 291 </task>
266 <servers /> 292 <servers />
267 </component> 293 </component>
268 <component name="TimeTrackingManager"> 294 <component name="TimeTrackingManager">
269 - <option name="totallyTimeSpent" value="266764000" /> 295 + <option name="totallyTimeSpent" value="276418000" />
270 </component> 296 </component>
271 <component name="ToolWindowManager"> 297 <component name="ToolWindowManager">
272 - <frame x="480" y="69" width="1935" height="1006" extended-state="0" />  
273 - <editor active="true" /> 298 + <frame x="82" y="37" width="1935" height="1003" extended-state="1" />
274 <layout> 299 <layout>
275 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16693333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 300 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16693333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
276 <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" /> 301 <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" />
277 <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" /> 302 <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" />
278 <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" /> 303 <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" />
@@ -318,25 +343,11 @@ @@ -318,25 +343,11 @@
318 </component> 343 </component>
319 <component name="XDebuggerManager"> 344 <component name="XDebuggerManager">
320 <breakpoint-manager> 345 <breakpoint-manager>
321 - <option name="time" value="7" /> 346 + <option name="time" value="8" />
322 </breakpoint-manager> 347 </breakpoint-manager>
323 <watches-manager /> 348 <watches-manager />
324 </component> 349 </component>
325 <component name="editorHistoryManager"> 350 <component name="editorHistoryManager">
326 - <entry file="file://$PROJECT_DIR$/app/index/model/ShoptypeModel.php">  
327 - <provider selected="true" editor-type-id="text-editor">  
328 - <state relative-caret-position="250">  
329 - <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="20" selection-end-column="5" />  
330 - </state>  
331 - </provider>  
332 - </entry>  
333 - <entry file="file://$PROJECT_DIR$/app/index/model/ShopgoodsModel.php">  
334 - <provider selected="true" editor-type-id="text-editor">  
335 - <state relative-caret-position="125">  
336 - <caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="45" selection-end-column="5" />  
337 - </state>  
338 - </provider>  
339 - </entry>  
340 <entry file="file://$PROJECT_DIR$/api/index/model/ShoptypeModel.php"> 351 <entry file="file://$PROJECT_DIR$/api/index/model/ShoptypeModel.php">
341 <provider selected="true" editor-type-id="text-editor"> 352 <provider selected="true" editor-type-id="text-editor">
342 <state relative-caret-position="275"> 353 <state relative-caret-position="275">
@@ -393,20 +404,6 @@ @@ -393,20 +404,6 @@
393 </state> 404 </state>
394 </provider> 405 </provider>
395 </entry> 406 </entry>
396 - <entry file="file://$PROJECT_DIR$/app/admin/controller/BuildController.php">  
397 - <provider selected="true" editor-type-id="text-editor">  
398 - <state relative-caret-position="800">  
399 - <caret line="37" column="35" lean-forward="false" selection-start-line="37" selection-start-column="35" selection-end-line="37" selection-end-column="35" />  
400 - </state>  
401 - </provider>  
402 - </entry>  
403 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html">  
404 - <provider selected="true" editor-type-id="text-editor">  
405 - <state relative-caret-position="358">  
406 - <caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />  
407 - </state>  
408 - </provider>  
409 - </entry>  
410 <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php"> 407 <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
411 <provider selected="true" editor-type-id="text-editor"> 408 <provider selected="true" editor-type-id="text-editor">
412 <state relative-caret-position="125"> 409 <state relative-caret-position="125">
@@ -414,14 +411,6 @@ @@ -414,14 +411,6 @@
414 </state> 411 </state>
415 </provider> 412 </provider>
416 </entry> 413 </entry>
417 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Request.php">  
418 - <provider selected="true" editor-type-id="text-editor">  
419 - <state relative-caret-position="310">  
420 - <caret line="269" column="20" lean-forward="false" selection-start-line="269" selection-start-column="20" selection-end-line="269" selection-end-column="20" />  
421 - <folding />  
422 - </state>  
423 - </provider>  
424 - </entry>  
425 <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/session/driver/Redis.php"> 414 <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/session/driver/Redis.php">
426 <provider selected="true" editor-type-id="text-editor"> 415 <provider selected="true" editor-type-id="text-editor">
427 <state relative-caret-position="250"> 416 <state relative-caret-position="250">
@@ -444,13 +433,6 @@ @@ -444,13 +433,6 @@
444 </state> 433 </state>
445 </provider> 434 </provider>
446 </entry> 435 </entry>
447 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
448 - <provider selected="true" editor-type-id="text-editor">  
449 - <state relative-caret-position="487">  
450 - <caret line="261" column="14" lean-forward="true" selection-start-line="261" selection-start-column="14" selection-end-line="261" selection-end-column="14" />  
451 - </state>  
452 - </provider>  
453 - </entry>  
454 <entry file="file://$PROJECT_DIR$/app/admin/controller/FeeController.php"> 436 <entry file="file://$PROJECT_DIR$/app/admin/controller/FeeController.php">
455 <provider selected="true" editor-type-id="text-editor"> 437 <provider selected="true" editor-type-id="text-editor">
456 <state relative-caret-position="0"> 438 <state relative-caret-position="0">
@@ -681,49 +663,142 @@ @@ -681,49 +663,142 @@
681 </state> 663 </state>
682 </provider> 664 </provider>
683 </entry> 665 </entry>
684 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 666 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
685 <provider selected="true" editor-type-id="text-editor"> 667 <provider selected="true" editor-type-id="text-editor">
686 - <state relative-caret-position="375">  
687 - <caret line="62" column="64" lean-forward="true" selection-start-line="61" selection-start-column="7" selection-end-line="62" selection-end-column="64" />  
688 - <folding /> 668 + <state relative-caret-position="419">
  669 + <caret line="154" column="54" lean-forward="false" selection-start-line="154" selection-start-column="54" selection-end-line="154" selection-end-column="54" />
  670 + <folding>
  671 + <element signature="e#131#162#0#PHP" expanded="false" />
  672 + <element signature="e#330#602#0#PHP" expanded="false" />
  673 + <element signature="e#608#968#0#PHP" expanded="false" />
  674 + <element signature="e#973#1861#0#PHP" expanded="false" />
  675 + <element signature="e#1867#2104#0#PHP" expanded="false" />
  676 + <element signature="e#2109#2809#0#PHP" expanded="false" />
  677 + <element signature="e#2815#3057#0#PHP" expanded="false" />
  678 + <element signature="e#3063#3300#0#PHP" expanded="false" />
  679 + <element signature="e#3305#3377#0#PHP" expanded="false" />
  680 + <element signature="e#3383#3830#0#PHP" expanded="false" />
  681 + </folding>
689 </state> 682 </state>
690 </provider> 683 </provider>
691 </entry> 684 </entry>
692 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 685 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
693 <provider selected="true" editor-type-id="text-editor"> 686 <provider selected="true" editor-type-id="text-editor">
694 - <state relative-caret-position="25">  
695 - <caret line="90" column="38" lean-forward="true" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" /> 687 + <state relative-caret-position="550">
  688 + <caret line="108" column="85" lean-forward="false" selection-start-line="108" selection-start-column="85" selection-end-line="108" selection-end-column="85" />
696 <folding> 689 <folding>
697 <element signature="e#324#855#0#PHP" expanded="false" /> 690 <element signature="e#324#855#0#PHP" expanded="false" />
698 <element signature="e#409#848#0#PHP" expanded="false" /> 691 <element signature="e#409#848#0#PHP" expanded="false" />
699 <element signature="e#861#925#0#PHP" expanded="false" /> 692 <element signature="e#861#925#0#PHP" expanded="false" />
700 <element signature="e#930#1766#0#PHP" expanded="false" /> 693 <element signature="e#930#1766#0#PHP" expanded="false" />
701 <element signature="e#1772#1853#0#PHP" expanded="false" /> 694 <element signature="e#1772#1853#0#PHP" expanded="false" />
702 - <element signature="e#3850#3873#0#PHP" expanded="false" />  
703 - <element signature="e#3878#4137#0#PHP" expanded="false" />  
704 - <element signature="e#4144#4193#0#PHP" expanded="false" />  
705 - <element signature="e#4198#4626#0#PHP" expanded="false" />  
706 - <element signature="e#4632#4696#0#PHP" expanded="false" />  
707 - <element signature="e#4701#5575#0#PHP" expanded="false" /> 695 + <element signature="e#3939#3962#0#PHP" expanded="false" />
  696 + <element signature="e#3967#4226#0#PHP" expanded="false" />
  697 + <element signature="e#4233#4282#0#PHP" expanded="false" />
  698 + <element signature="e#4287#4715#0#PHP" expanded="false" />
  699 + <element signature="e#4721#4785#0#PHP" expanded="false" />
  700 + <element signature="e#4790#5664#0#PHP" expanded="false" />
708 </folding> 701 </folding>
709 </state> 702 </state>
710 </provider> 703 </provider>
711 </entry> 704 </entry>
712 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 705 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Request.php">
713 <provider selected="true" editor-type-id="text-editor"> 706 <provider selected="true" editor-type-id="text-editor">
714 - <state relative-caret-position="419">  
715 - <caret line="154" column="54" lean-forward="false" selection-start-line="154" selection-start-column="54" selection-end-line="154" selection-end-column="54" /> 707 + <state relative-caret-position="280">
  708 + <caret line="269" column="20" lean-forward="false" selection-start-line="269" selection-start-column="20" selection-end-line="269" selection-end-column="20" />
  709 + <folding />
  710 + </state>
  711 + </provider>
  712 + </entry>
  713 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  714 + <provider selected="true" editor-type-id="text-editor">
  715 + <state relative-caret-position="116">
  716 + <caret line="42" column="4" lean-forward="false" selection-start-line="42" selection-start-column="4" selection-end-line="58" selection-end-column="7" />
716 <folding> 717 <folding>
717 - <element signature="e#131#162#0#PHP" expanded="true" />  
718 - <element signature="e#330#602#0#PHP" expanded="false" />  
719 - <element signature="e#608#968#0#PHP" expanded="false" />  
720 - <element signature="e#973#1861#0#PHP" expanded="false" />  
721 - <element signature="e#1867#2104#0#PHP" expanded="false" />  
722 - <element signature="e#2109#2809#0#PHP" expanded="false" />  
723 - <element signature="e#2815#3057#0#PHP" expanded="false" />  
724 - <element signature="e#3063#3300#0#PHP" expanded="false" />  
725 - <element signature="e#3305#3377#0#PHP" expanded="false" />  
726 - <element signature="e#3383#3830#0#PHP" expanded="false" /> 718 + <element signature="e#797#1266#0#PHP" expanded="false" />
  719 + <element signature="e#2045#2263#0#PHP" expanded="false" />
  720 + <element signature="e#2268#2476#0#PHP" expanded="false" />
  721 + <element signature="e#2482#2814#0#PHP" expanded="false" />
  722 + <element signature="e#2819#3199#0#PHP" expanded="false" />
  723 + <element signature="e#3205#3717#0#PHP" expanded="false" />
  724 + <element signature="e#3722#4285#0#PHP" expanded="false" />
  725 + </folding>
  726 + </state>
  727 + </provider>
  728 + </entry>
  729 + <entry file="file://$PROJECT_DIR$/app/admin/controller/BuildController.php">
  730 + <provider selected="true" editor-type-id="text-editor">
  731 + <state relative-caret-position="250">
  732 + <caret line="17" column="4" lean-forward="false" selection-start-line="17" selection-start-column="4" selection-end-line="45" selection-end-column="5" />
  733 + <folding>
  734 + <element signature="e#262#1156#0#PHP" expanded="false" />
  735 + </folding>
  736 + </state>
  737 + </provider>
  738 + </entry>
  739 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html">
  740 + <provider selected="true" editor-type-id="text-editor">
  741 + <state relative-caret-position="333">
  742 + <caret line="35" column="32" lean-forward="false" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
  743 + <folding />
  744 + </state>
  745 + </provider>
  746 + </entry>
  747 + <entry file="file://$PROJECT_DIR$/app/admin/controller/KnowController.php">
  748 + <provider selected="true" editor-type-id="text-editor">
  749 + <state relative-caret-position="366">
  750 + <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
  751 + <folding>
  752 + <element signature="e#131#170#0#PHP" expanded="true" />
  753 + </folding>
  754 + </state>
  755 + </provider>
  756 + </entry>
  757 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html">
  758 + <provider selected="true" editor-type-id="text-editor">
  759 + <state relative-caret-position="150">
  760 + <caret line="51" column="88" lean-forward="true" selection-start-line="51" selection-start-column="88" selection-end-line="51" selection-end-column="88" />
  761 + <folding />
  762 + </state>
  763 + </provider>
  764 + </entry>
  765 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  766 + <provider selected="true" editor-type-id="text-editor">
  767 + <state relative-caret-position="1391">
  768 + <caret line="489" column="5" lean-forward="false" selection-start-line="489" selection-start-column="5" selection-end-line="489" selection-end-column="5" />
  769 + <folding>
  770 + <element signature="e#321#575#0#PHP" expanded="false" />
  771 + <element signature="e#580#865#0#PHP" expanded="false" />
  772 + <element signature="e#871#1206#0#PHP" expanded="false" />
  773 + <element signature="e#1211#1708#0#PHP" expanded="false" />
  774 + <element signature="e#1714#1974#0#PHP" expanded="false" />
  775 + <element signature="e#1979#2268#0#PHP" expanded="false" />
  776 + <element signature="e#2274#2613#0#PHP" expanded="false" />
  777 + <element signature="e#2618#3121#0#PHP" expanded="false" />
  778 + <element signature="e#3127#3343#0#PHP" expanded="false" />
  779 + <element signature="e#3348#3717#0#PHP" expanded="false" />
  780 + <element signature="e#3723#4025#0#PHP" expanded="false" />
  781 + <element signature="e#4030#4429#0#PHP" expanded="false" />
  782 + <element signature="e#4435#4632#0#PHP" expanded="false" />
  783 + <element signature="e#4637#4894#0#PHP" expanded="false" />
  784 + <element signature="e#4900#5096#0#PHP" expanded="false" />
  785 + <element signature="e#5101#5363#0#PHP" expanded="false" />
  786 + <element signature="e#5369#5796#0#PHP" expanded="false" />
  787 + <element signature="e#5801#6358#0#PHP" expanded="false" />
  788 + <element signature="e#6364#6707#0#PHP" expanded="false" />
  789 + <element signature="e#6712#7193#0#PHP" expanded="false" />
  790 + <element signature="e#7199#7532#0#PHP" expanded="false" />
  791 + <element signature="e#7537#7892#0#PHP" expanded="false" />
  792 + <element signature="e#7898#8251#0#PHP" expanded="false" />
  793 + <element signature="e#8256#8661#0#PHP" expanded="false" />
  794 + <element signature="e#8667#9050#0#PHP" expanded="false" />
  795 + <element signature="e#9055#9722#0#PHP" expanded="false" />
  796 + <element signature="e#9728#10172#0#PHP" expanded="false" />
  797 + <element signature="e#10177#11024#0#PHP" expanded="false" />
  798 + <element signature="e#11030#11298#0#PHP" expanded="false" />
  799 + <element signature="e#11303#11775#0#PHP" expanded="false" />
  800 + <element signature="e#11781#12087#0#PHP" expanded="false" />
  801 + <element signature="e#12092#12809#0#PHP" expanded="false" />
727 </folding> 802 </folding>
728 </state> 803 </state>
729 </provider> 804 </provider>
@@ -103,9 +103,10 @@ class PayController extends HomeBaseController @@ -103,9 +103,10 @@ class PayController extends HomeBaseController
103 ->where('user_id',$order['user_id']) 103 ->where('user_id',$order['user_id'])
104 ->update($res); 104 ->update($res);
105 $after_wallet = $res['after_wallet']; 105 $after_wallet = $res['after_wallet'];
  106 + $add_total = $list['add_total'] + $res['total'];
106 Db::name('integral') 107 Db::name('integral')
107 ->where('user_id',$order['user_id']) 108 ->where('user_id',$order['user_id'])
108 - ->update(['now_integral'=>$after_wallet]); 109 + ->update(['now_integral'=>$after_wallet,'add_total'=>$add_total]);
109 } else { // 用户支付失败 110 } else { // 用户支付失败
110 $update['status']=1; 111 $update['status']=1;
111 } 112 }
@@ -12,6 +12,7 @@ namespace api\index\controller; @@ -12,6 +12,7 @@ namespace api\index\controller;
12 use cmf\controller\RestBaseController; 12 use cmf\controller\RestBaseController;
13 use think\Db; 13 use think\Db;
14 use think\Request; 14 use think\Request;
  15 +use think\Validate;
15 16
16 17
17 /** 18 /**
@@ -203,6 +204,26 @@ class RecycleController extends RestBaseController @@ -203,6 +204,26 @@ class RecycleController extends RestBaseController
203 } 204 }
204 205
205 /** 206 /**
  207 + * @title 回收首页环保知识logo
  208 + * @description
  209 + * @author GuoSheng
  210 + * @url /index/Recycle/know
  211 + * @method GET
  212 + *
  213 + * @return id:ID
  214 + * @return thumbnail:图片
  215 + *
  216 + */
  217 + public function know(){
  218 + $data = Db::name('knowledge')
  219 + ->where('id',1)
  220 + ->field('id,thumbnail')
  221 + ->find();
  222 + $data['thumbnail'] = cmf_get_image_url($data['thumbnail']);
  223 + $this->success('SUCCESS',$data);
  224 + }
  225 +
  226 + /**
206 * @title 回收首页服务评价列表 227 * @title 回收首页服务评价列表
207 * @description 228 * @description
208 * @author GuoSheng 229 * @author GuoSheng
@@ -246,7 +267,7 @@ class RecycleController extends RestBaseController @@ -246,7 +267,7 @@ class RecycleController extends RestBaseController
246 * @header name:XX-Token require:1 default: desc:token 267 * @header name:XX-Token require:1 default: desc:token
247 * 268 *
248 * @return status:状态 (1没有注册过 2注册过) 269 * @return status:状态 (1没有注册过 2注册过)
249 - * @return after_wallet:当前积分 270 + * @return now_integral:当前积分
250 * @return num:参与次数 271 * @return num:参与次数
251 * @return add_total:累计积分 272 * @return add_total:累计积分
252 * 273 *
@@ -261,7 +282,7 @@ class RecycleController extends RestBaseController @@ -261,7 +282,7 @@ class RecycleController extends RestBaseController
261 $res['status'] = 1; 282 $res['status'] = 1;
262 }else{ 283 }else{
263 $res['status'] = 2; 284 $res['status'] = 2;
264 - $res['after_wallet'] = $data['after_wallet']; 285 + $res['now_integral'] = $data['now_integral'];
265 $res['num'] = $data['num']; 286 $res['num'] = $data['num'];
266 $res['add_total'] = $data['add_total']; 287 $res['add_total'] = $data['add_total'];
267 } 288 }
@@ -297,13 +318,152 @@ class RecycleController extends RestBaseController @@ -297,13 +318,152 @@ class RecycleController extends RestBaseController
297 } 318 }
298 319
299 /** 320 /**
  321 + * @title 上门回收地址详情
  322 + * @description
  323 + * @author GuoSheng
  324 + * @url /index/Recycle/recycleDetail
  325 + * @method GET
  326 + *
  327 + * @header name:XX-Token require:1 default: desc:token
  328 + *
  329 + * @param name:id require:1 default: desc:回收地址ID
  330 + *
  331 + * @return name:姓名
  332 + * @return phone:电话
  333 + * @return address:详细地址
  334 + *
  335 + */
  336 + public function recycleDetail()
  337 + {
  338 + $user_id = $this->getUserId();
  339 + $id = $this->request->param('id',0,'intval');
  340 + if(empty($id)){
  341 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  342 + }
  343 + $data = Db::name('recycle')
  344 + ->where('id',$id)
  345 + ->field('id,name,phone,address')
  346 + ->find();
  347 + $this->success('SUCCESS',$data);
  348 + }
  349 +
  350 + /**
  351 + * @title 添加上门回收地址
  352 + * @description
  353 + * @author GuoSheng
  354 + * @url /index/Recycle/addrecycle
  355 + * @method GET
  356 + *
  357 + * @header name:XX-Token require:1 default: desc:token
  358 + *
  359 + * @param name:name require:1 default: desc:联系人姓名
  360 + * @param name:phone require:1 default: desc:联系人电话
  361 + * @param name:address require:1 default: desc:联系人详细地址
  362 + *
  363 + */
  364 + public function addrecycle()
  365 + {
  366 + $user_id = $this->getUserId();
  367 + $param = $this->request->param();
  368 + $param['user_id'] = $user_id;
  369 + $param['create_time'] = time();
  370 + $validate = new Validate([
  371 + 'name' => 'require',
  372 + 'phone' => 'require',
  373 + 'address'=>'require',
  374 + ]);
  375 + if (!$validate->check($param)) {
  376 + $this->error(['code'=>40005,'msg'=>$validate->getError()]);
  377 + }
  378 + $data = Db::name('recycle')
  379 + ->insert($param);
  380 + if(empty($data)){
  381 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  382 + }
  383 + $this->success('SUCCESS');
  384 + }
  385 +
  386 + /**
  387 + * @title 修改上门回收地址
  388 + * @description
  389 + * @author GuoSheng
  390 + * @url /index/Recycle/editrecycle
  391 + * @method GET
  392 + *
  393 + * @header name:XX-Token require:1 default: desc:token
  394 + *
  395 + * @param name:id require:1 default: desc:回收地址ID
  396 + *
  397 + * @param name:name require:1 default: desc:联系人姓名
  398 + * @param name:phone require:1 default: desc:联系人电话
  399 + * @param name:address require:1 default: desc:联系人详细地址
  400 + *
  401 + */
  402 + public function editrecycle()
  403 + {
  404 + $user_id = $this->getUserId();
  405 + $id = $this->request->param('id',0,'intval');
  406 + if(empty($id)){
  407 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  408 + }
  409 + $param = $this->request->param();
  410 + $param['user_id'] = $user_id;
  411 + $param['update_time'] = time();
  412 + $validate = new Validate([
  413 + 'name' => 'require',
  414 + 'phone' => 'require',
  415 + 'address'=>'require',
  416 + ]);
  417 + if (!$validate->check($param)) {
  418 + $this->error(['code'=>40005,'msg'=>$validate->getError()]);
  419 + }
  420 + $data = Db::name('recycle')
  421 + ->where('id',$id)
  422 + ->update($param);
  423 + if(empty($data)){
  424 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  425 + }
  426 + $this->success('SUCCESS');
  427 + }
  428 +
  429 + /**
  430 + * @title 删除上门回收地址
  431 + * @description
  432 + * @author GuoSheng
  433 + * @url /index/Recycle/delrecycle
  434 + * @method GET
  435 + *
  436 + * @header name:XX-Token require:1 default: desc:token
  437 + *
  438 + * @param name:id require:1 default: desc:回收地址ID
  439 + *
  440 + */
  441 + public function delrecycle()
  442 + {
  443 + $user_id = $this->getUserId();
  444 + $id = $this->request->param('id',0,'intval');
  445 + if(empty($id)){
  446 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  447 + }
  448 + $data = Db::name('recycle')
  449 + ->where('id',$id)
  450 + ->update(['delete_time'=>time()]);
  451 + if(empty($data)){
  452 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  453 + }
  454 + $this->success('SUCCESS');
  455 + }
  456 +
  457 + /**
300 * @title 上传文件 458 * @title 上传文件
301 * @description 接口说明 459 * @description 接口说明
302 * @author 开发者 460 * @author 开发者
303 - * @url /index/Resource/uploadFile 461 + * @url /index/Recycle/uploadFile
304 * @method POST 462 * @method POST
305 * @header name:XX-Token require:1 default: desc:token 463 * @header name:XX-Token require:1 default: desc:token
306 - * @param name:image type:file require:1 default: other: desc:文件 464 + *
  465 + * @param name:image[] type:file require:1 default: other: desc:文件
  466 + *
307 * @return image_url:图片路径 467 * @return image_url:图片路径
308 */ 468 */
309 public function uploadFile(){ 469 public function uploadFile(){
@@ -311,15 +471,21 @@ class RecycleController extends RestBaseController @@ -311,15 +471,21 @@ class RecycleController extends RestBaseController
311 if (empty($files)) { 471 if (empty($files)) {
312 $this->error('未检出文件上传'); 472 $this->error('未检出文件上传');
313 } 473 }
314 - if($files){  
315 - $info = $files->move(ROOT_PATH . 'public' . DS . 'uploads'); 474 + $countFile = count($files);
  475 + if($countFile > 5) {
  476 + $this->error('最多上传5张图片');
  477 + }
  478 + $url = '';
  479 + foreach ($files as $file){
  480 + $info = $file->move(ROOT_PATH . 'public' . DS . 'uploads');
316 if($info){ 481 if($info){
317 $request = Request::instance(); 482 $request = Request::instance();
318 $a = $request->domain().'/'.'uploads/'.$info->getSaveName(); 483 $a = $request->domain().'/'.'uploads/'.$info->getSaveName();
319 - $this->success('SUCCESS',$a); 484 + $url .= $a.',';
320 }else{ 485 }else{
321 $this->error($files->getError()); 486 $this->error($files->getError());
322 } 487 }
323 } 488 }
  489 + $this->success('SUCCESS',rtrim($url,','));
324 } 490 }
325 } 491 }
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/11/15
  6 + * Time: 14:19
  7 + */
  8 +
  9 +namespace app\admin\controller;
  10 +
  11 +
  12 +use cmf\controller\AdminBaseController;
  13 +use think\Db;
  14 +use think\Validate;
  15 +
  16 +class KnowController extends AdminBaseController
  17 +{
  18 + public function index()
  19 + {
  20 + $id = $this->request->param('id', 1, 'intval');
  21 + if ($this->request->isPost()) {
  22 + $param = $this->request->param();
  23 + $validate = new Validate([
  24 + 'thumbnail' => 'require',
  25 + ]);
  26 + $validate->message([
  27 + 'thumbnail' => '缩略图不能为空',
  28 + ]);
  29 + if (!$validate->check($param)) {
  30 + $this->error($validate->getError());
  31 + }
  32 + $param['update_time'] = time();
  33 + Db::name('knowledge')
  34 + ->where('id', $id)
  35 + ->update($param);
  36 + $this->success('更新成功');
  37 + } else {
  38 + $data = Db::name('knowledge')
  39 + ->where('id', $id)
  40 + ->find();
  41 + $this->assign([
  42 + 'data' => $data,
  43 + ]);
  44 + return $this->fetch();
  45 + }
  46 + }
  47 +}
@@ -10,6 +10,7 @@ return array ( @@ -10,6 +10,7 @@ return array (
10 'ADMIN_HOOK_PLUGINLISTORDER' => '钩子插件排序', 10 'ADMIN_HOOK_PLUGINLISTORDER' => '钩子插件排序',
11 'ADMIN_HOOK_PLUGINS' => '钩子插件管理', 11 'ADMIN_HOOK_PLUGINS' => '钩子插件管理',
12 'ADMIN_HOOK_SYNC' => '同步钩子', 12 'ADMIN_HOOK_SYNC' => '同步钩子',
  13 + 'ADMIN_KNOW_INDEX' => '环保知识logo图',
13 'ADMIN_LINK_ADD' => '添加友情链接', 14 'ADMIN_LINK_ADD' => '添加友情链接',
14 'ADMIN_LINK_ADDPOST' => '添加友情链接提交保存', 15 'ADMIN_LINK_ADDPOST' => '添加友情链接提交保存',
15 'ADMIN_LINK_DELETE' => '删除友情链接', 16 'ADMIN_LINK_DELETE' => '删除友情链接',
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="col-md-9"> 33 <div class="col-md-9">
34 <table class="table table-bordered"> 34 <table class="table table-bordered">
35 <tr> 35 <tr>
36 - <td>缩略图</td> 36 + <td>建筑材料缩略图</td>
37 <td> 37 <td>
38 <input type="hidden" name="id" value="{$data.id}"> 38 <input type="hidden" name="id" value="{$data.id}">
39 <input type="hidden" name="thumbnail" id="thumbnail" 39 <input type="hidden" name="thumbnail" id="thumbnail"
  1 +<include file="public@header"/>
  2 +</head>
  3 +<body>
  4 +<!--<script type="text/html" id="photos-item-tpl">-->
  5 +<!--<li id="saved-image{id}">-->
  6 +<!--<input id="photo-{id}" type="hidden" name="environment[]" value="{filepath}">-->
  7 +<!--<img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"-->
  8 +<!--onclick="imagePreviewDialog(this.src);">-->
  9 +<!--<a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>-->
  10 +<!--<a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>-->
  11 +<!--</li>-->
  12 +<!--</script>-->
  13 +<script type="text/html" id="photos-item-tpl">
  14 + <li id="saved-image{id}">
  15 + <input id="photo-{id}" type="hidden" name="images[]" value="{filepath}">
  16 + <img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"
  17 + onclick="imagePreviewDialog(this.src);">
  18 + <a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>
  19 + <a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>
  20 + </li>
  21 +</script>
  22 +<!--<script type="text/html" id="video-item-tpl">-->
  23 +<!--<li id="saved-video{id}">-->
  24 +<!--<input id="video-{id}" type="hidden" name="video" value="{filepath}">-->
  25 +<!--<a id="video-{id}-preview" href="{:cmf_get_image_url('')}{filepath}" target="_blank">查看</a>-->
  26 +<!--<a href="javascript:uploadOne('视频上传','#video-{id}','video');">替换</a>-->
  27 +<!--<a href="javascript:(function(){$('#saved-video{id}').remove();})();">移除</a>-->
  28 +<!--</li>-->
  29 +<!--</script>-->
  30 +<div class="wrap js-check-wrap">
  31 + <form action="{:url('know/index')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
  32 + <div class="row">
  33 + <div class="col-md-9">
  34 + <table class="table table-bordered">
  35 + <tr>
  36 + <td>专业知识缩略图</td>
  37 + <td>
  38 + <input type="hidden" name="id" value="{$data.id}">
  39 + <input type="hidden" name="thumbnail" id="thumbnail"
  40 + value="{$data.thumbnail|default=''}">
  41 + <a href="javascript:uploadOneImage('image upload','#thumbnail');">
  42 + <if condition="empty($data['thumbnail'])">
  43 + <img src="__TMPL__/public/assets/images/default-thumbnail.png"
  44 + id="thumbnail-preview"
  45 + width="135" style="cursor: pointer"/>
  46 + <else/>
  47 + <img src="{:cmf_get_image_url($data.thumbnail)}"
  48 + id="thumbnail-preview"
  49 + width="135" style="cursor: pointer"/>
  50 + </if>
  51 + </a>
  52 + <input type="button" class="btn btn-sm btn-cancel-thumbnail"
  53 + value="取消图片">
  54 + </td>
  55 + </tr>
  56 + </table>
  57 + <div class="form-group">
  58 + <div class="col-sm-offset-2 col-sm-10">
  59 + <button type="submit" class="btn btn-primary js-ajax-submit">更新</button>
  60 + </div>
  61 + </div>
  62 + </div>
  63 + </div>
  64 + </form>
  65 +</div>
  66 +<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
  67 +<script type="text/javascript">
  68 + //编辑器路径定义
  69 + var editorURL = GV.WEB_ROOT;
  70 +</script>
  71 +<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
  72 +<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
  73 +<script type="text/javascript">
  74 + $(function () {
  75 +
  76 + editorcontent = new baidu.editor.ui.Editor();
  77 + editorcontent.render('content');
  78 + try {
  79 + editorcontent.sync();
  80 + } catch (err) {
  81 + }
  82 +
  83 + $('.btn-cancel-thumbnail').click(function () {
  84 + $('#thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
  85 + $('#thumbnail').val('');
  86 + });
  87 +
  88 + $('.btn-cancel-video_thumbnail').click(function () {
  89 + $('#video_thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
  90 + $('#video_thumbnail').val('');
  91 + });
  92 +
  93 +
  94 + });
  95 +</script>
  96 +</body>
  97 +</html>