郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 940b714a7080797da11c3a051377d663a0c2889c 1 个父辈 183b026e
1 个管道 的构建 通过 耗费 13 秒

去除历史记录接口，增加关键字标签接口

内嵌 并排对比
正在显示 13 个修改的文件 包含 466 行增加 和 317 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="BookmarkManager"> 3 <component name="BookmarkManager">
4 - <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="25" /> 4 + <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
8 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js" />  
9 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/README.md" />  
10 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.css" />  
11 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.js" />  
12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/css/backend.css" afterPath="$PROJECT_DIR$/public/assets/css/backend.css" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/require-backend.js" afterPath="$PROJECT_DIR$/public/assets/js/require-backend.js" />  
15 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/require-table.js" afterPath="$PROJECT_DIR$/public/assets/js/require-table.js" /> 9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Words.php" afterPath="$PROJECT_DIR$/application/admin/controller/Words.php" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
  15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/words/add.html" afterPath="$PROJECT_DIR$/application/admin/view/words/add.html" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/words/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/words/edit.html" />
  17 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  18 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
  19 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
  20 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/words.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/words.js" />
16 </list> 21 </list>
17 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 22 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
18 <option name="TRACKING_ENABLED" value="true" /> 23 <option name="TRACKING_ENABLED" value="true" />
@@ -21,67 +26,63 @@ @@ -21,67 +26,63 @@
21 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 26 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
22 <option name="LAST_RESOLUTION" value="IGNORE" /> 27 <option name="LAST_RESOLUTION" value="IGNORE" />
23 </component> 28 </component>
24 - <component name="FileEditorManager"> 29 + <component name="DockManager">
  30 + <window id="3">
  31 + <content type="file-editors">
  32 + <state>
25 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 33 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
26 - <file leaf-file-name="video.js" pinned="false" current-in-tab="false">  
27 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> 34 + <file leaf-file-name="add.html" pinned="false" current-in-tab="true">
  35 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
28 <provider selected="true" editor-type-id="text-editor"> 36 <provider selected="true" editor-type-id="text-editor">
29 - <state relative-caret-position="275">  
30 - <caret line="11" column="45" lean-forward="false" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" /> 37 + <state relative-caret-position="75">
  38 + <caret line="158" column="28" lean-forward="false" selection-start-line="158" selection-start-column="28" selection-end-line="158" selection-end-column="28" />
31 <folding /> 39 <folding />
32 </state> 40 </state>
33 </provider> 41 </provider>
34 </entry> 42 </entry>
35 </file> 43 </file>
36 - <file leaf-file-name="require-table.js" pinned="false" current-in-tab="false">  
37 - <entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">  
38 - <provider selected="true" editor-type-id="text-editor">  
39 - <state relative-caret-position="-25">  
40 - <caret line="29" column="29" lean-forward="true" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />  
41 - <folding>  
42 - <marker date="1583401745828" expanded="true" signature="26283:26309" ph="..." />  
43 - </folding> 44 + </leaf>
44 </state> 45 </state>
45 - </provider>  
46 - </entry>  
47 - </file>  
48 - <file leaf-file-name="require-backend.js" pinned="false" current-in-tab="false">  
49 - <entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.js"> 46 + </content>
  47 + </window>
  48 + </component>
  49 + <component name="FileEditorManager">
  50 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  51 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
  52 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
50 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
51 - <state relative-caret-position="425">  
52 - <caret line="92" column="48" lean-forward="true" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" /> 54 + <state relative-caret-position="25">
  55 + <caret line="705" column="0" lean-forward="false" selection-start-line="705" selection-start-column="0" selection-end-line="705" selection-end-column="0" />
53 <folding> 56 <folding>
54 - <element signature="e#3390#3492#0" expanded="false" />  
55 - <element signature="e#3528#3645#0" expanded="false" />  
56 - <element signature="e#3681#3783#0" expanded="false" />  
57 - <element signature="e#3827#3929#0" expanded="false" />  
58 - <element signature="e#3971#4073#0" expanded="false" />  
59 - <element signature="e#4111#4225#0" expanded="false" /> 57 + <element signature="e#506#1244#0#PHP" expanded="false" />
  58 + <element signature="e#1249#2912#0#PHP" expanded="false" />
  59 + <element signature="e#2918#3280#0#PHP" expanded="false" />
  60 + <element signature="e#3285#3575#0#PHP" expanded="false" />
  61 + <element signature="e#3582#4016#0#PHP" expanded="false" />
  62 + <element signature="e#4021#4379#0#PHP" expanded="false" />
  63 + <element signature="e#4385#4792#0#PHP" expanded="false" />
  64 + <element signature="e#4797#5140#0#PHP" expanded="false" />
  65 + <element signature="e#5146#5559#0#PHP" expanded="false" />
  66 + <element signature="e#5564#5881#0#PHP" expanded="false" />
  67 + <element signature="e#5887#6724#0#PHP" expanded="false" />
  68 + <element signature="e#6729#8924#0#PHP" expanded="false" />
  69 + <element signature="e#8930#9610#0#PHP" expanded="false" />
  70 + <element signature="e#9615#10528#0#PHP" expanded="false" />
  71 + <element signature="e#10534#11323#0#PHP" expanded="false" />
  72 + <element signature="e#11328#12677#0#PHP" expanded="false" />
  73 + <element signature="e#12683#13385#0#PHP" expanded="false" />
  74 + <element signature="e#13390#14710#0#PHP" expanded="false" />
  75 + <element signature="e#14716#15292#0#PHP" expanded="false" />
  76 + <element signature="e#15297#15909#0#PHP" expanded="false" />
  77 + <element signature="e#19182#20084#0#PHP" expanded="false" />
  78 + <element signature="e#20089#22907#0#PHP" expanded="false" />
  79 + <element signature="e#22913#23290#0#PHP" expanded="false" />
  80 + <element signature="e#23295#23737#0#PHP" expanded="false" />
60 </folding> 81 </folding>
61 </state> 82 </state>
62 </provider> 83 </provider>
63 </entry> 84 </entry>
64 </file> 85 </file>
65 - <file leaf-file-name="bootstrap-table-jumpto.js" pinned="false" current-in-tab="false">  
66 - <entry file="file://$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js">  
67 - <provider selected="true" editor-type-id="text-editor">  
68 - <state relative-caret-position="308">  
69 - <caret line="39" column="15" lean-forward="true" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />  
70 - <folding />  
71 - </state>  
72 - </provider>  
73 - </entry>  
74 - </file>  
75 - <file leaf-file-name="backend.css" pinned="false" current-in-tab="true">  
76 - <entry file="file://$PROJECT_DIR$/public/assets/css/backend.css">  
77 - <provider selected="true" editor-type-id="text-editor">  
78 - <state relative-caret-position="431">  
79 - <caret line="1002" column="19" lean-forward="true" selection-start-line="1002" selection-start-column="19" selection-end-line="1002" selection-end-column="19" />  
80 - <folding />  
81 - </state>  
82 - </provider>  
83 - </entry>  
84 - </file>  
85 </leaf> 86 </leaf>
86 </component> 87 </component>
87 <component name="FileTemplateManagerImpl"> 88 <component name="FileTemplateManagerImpl">
@@ -114,7 +115,6 @@ @@ -114,7 +115,6 @@
114 <component name="IdeDocumentHistory"> 115 <component name="IdeDocumentHistory">
115 <option name="CHANGED_PATHS"> 116 <option name="CHANGED_PATHS">
116 <list> 117 <list>
117 - <option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" />  
118 <option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" /> 118 <option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" />
119 <option value="$PROJECT_DIR$/vendor/tecnickcom/tcpdf/examples/example_002.php" /> 119 <option value="$PROJECT_DIR$/vendor/tecnickcom/tcpdf/examples/example_002.php" />
120 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> 120 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
@@ -146,25 +146,26 @@ @@ -146,25 +146,26 @@
146 <option value="$PROJECT_DIR$/application/admin/view/cover/index.html" /> 146 <option value="$PROJECT_DIR$/application/admin/view/cover/index.html" />
147 <option value="$PROJECT_DIR$/application/admin/view/cover/edit.html" /> 147 <option value="$PROJECT_DIR$/application/admin/view/cover/edit.html" />
148 <option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" /> 148 <option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" />
149 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
150 - <option value="$PROJECT_DIR$/public/assets/js/backend/words.js" />  
151 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />  
152 - <option value="$PROJECT_DIR$/application/admin/view/words/add.html" />  
153 - <option value="$PROJECT_DIR$/application/admin/view/words/edit.html" />  
154 <option value="$PROJECT_DIR$/application/admin/view/words/index.html" /> 149 <option value="$PROJECT_DIR$/application/admin/view/words/index.html" />
155 <option value="$PROJECT_DIR$/application/admin/model/Video.php" /> 150 <option value="$PROJECT_DIR$/application/admin/model/Video.php" />
156 <option value="$PROJECT_DIR$/application/admin/view/addword/index.html" /> 151 <option value="$PROJECT_DIR$/application/admin/view/addword/index.html" />
157 <option value="$PROJECT_DIR$/application/admin/controller/Addword.php" /> 152 <option value="$PROJECT_DIR$/application/admin/controller/Addword.php" />
158 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />  
159 - <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />  
160 - <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />  
161 - <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />  
162 <option value="$PROJECT_DIR$/bower.json" /> 153 <option value="$PROJECT_DIR$/bower.json" />
163 <option value="$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js" /> 154 <option value="$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js" />
164 - <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />  
165 <option value="$PROJECT_DIR$/public/assets/js/require-table.js" /> 155 <option value="$PROJECT_DIR$/public/assets/js/require-table.js" />
166 <option value="$PROJECT_DIR$/public/assets/js/require-backend.js" /> 156 <option value="$PROJECT_DIR$/public/assets/js/require-backend.js" />
167 <option value="$PROJECT_DIR$/public/assets/css/backend.css" /> 157 <option value="$PROJECT_DIR$/public/assets/css/backend.css" />
  158 + <option value="$PROJECT_DIR$/public/assets/js/backend/words.js" />
  159 + <option value="$PROJECT_DIR$/application/admin/view/words/add.html" />
  160 + <option value="$PROJECT_DIR$/application/admin/view/words/edit.html" />
  161 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />
  162 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
  163 + <option value="$PROJECT_DIR$/application/admin/controller/Words.php" />
  164 + <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
  165 + <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
  166 + <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
  167 + <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
  168 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
168 </list> 169 </list>
169 </option> 170 </option>
170 </component> 171 </component>
@@ -183,10 +184,10 @@ @@ -183,10 +184,10 @@
183 </component> 184 </component>
184 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 185 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
185 <component name="ProjectFrameBounds" extendedState="1"> 186 <component name="ProjectFrameBounds" extendedState="1">
186 - <option name="x" value="192" /> 187 + <option name="x" value="99" />
187 <option name="y" value="105" /> 188 <option name="y" value="105" />
188 - <option name="width" value="1642" />  
189 - <option name="height" value="921" /> 189 + <option name="width" value="1940" />
  190 + <option name="height" value="883" />
190 </component> 191 </component>
191 <component name="ProjectView"> 192 <component name="ProjectView">
192 <navigator currentView="ProjectPane" proportions="" version="1"> 193 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -203,7 +204,6 @@ @@ -203,7 +204,6 @@
203 <foldersAlwaysOnTop value="true" /> 204 <foldersAlwaysOnTop value="true" />
204 </navigator> 205 </navigator>
205 <panes> 206 <panes>
206 - <pane id="Scratches" />  
207 <pane id="ProjectPane"> 207 <pane id="ProjectPane">
208 <subPane> 208 <subPane>
209 <expand> 209 <expand>
@@ -214,32 +214,26 @@ @@ -214,32 +214,26 @@
214 <path> 214 <path>
215 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 215 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
216 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 216 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
217 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
218 - </path>  
219 - <path>  
220 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
221 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
222 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
223 - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" /> 217 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
224 </path> 218 </path>
225 <path> 219 <path>
226 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 220 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
227 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 221 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
228 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
229 - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />  
230 - <item name="css" type="2a2b976b:PhpTreeStructureProvider$1" /> 222 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  223 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
231 </path> 224 </path>
232 <path> 225 <path>
233 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 226 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
234 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 227 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
235 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
236 - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />  
237 - <item name="libs" type="2a2b976b:PhpTreeStructureProvider$1" /> 228 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  229 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  230 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
238 </path> 231 </path>
239 </expand> 232 </expand>
240 <select /> 233 <select />
241 </subPane> 234 </subPane>
242 </pane> 235 </pane>
  236 + <pane id="Scratches" />
243 <pane id="Scope" /> 237 <pane id="Scope" />
244 </panes> 238 </panes>
245 </component> 239 </component>
@@ -370,7 +364,9 @@ @@ -370,7 +364,9 @@
370 <workItem from="1578886287019" duration="125000" /> 364 <workItem from="1578886287019" duration="125000" />
371 <workItem from="1578887472055" duration="2928000" /> 365 <workItem from="1578887472055" duration="2928000" />
372 <workItem from="1583368540533" duration="14325000" /> 366 <workItem from="1583368540533" duration="14325000" />
373 - <workItem from="1583392420452" duration="9821000" /> 367 + <workItem from="1583392420452" duration="12446000" />
  368 + <workItem from="1583454639047" duration="19611000" />
  369 + <workItem from="1583481861278" duration="221000" />
374 </task> 370 </task>
375 <task id="LOCAL-00001" summary="调试"> 371 <task id="LOCAL-00001" summary="调试">
376 <created>1574145133364</created> 372 <created>1574145133364</created>
@@ -397,7 +393,7 @@ @@ -397,7 +393,7 @@
397 <servers /> 393 <servers />
398 </component> 394 </component>
399 <component name="TimeTrackingManager"> 395 <component name="TimeTrackingManager">
400 - <option name="totallyTimeSpent" value="483544000" /> 396 + <option name="totallyTimeSpent" value="506001000" />
401 </component> 397 </component>
402 <component name="TodoView"> 398 <component name="TodoView">
403 <todo-panel id="selected-file"> 399 <todo-panel id="selected-file">
@@ -409,25 +405,25 @@ @@ -409,25 +405,25 @@
409 </todo-panel> 405 </todo-panel>
410 </component> 406 </component>
411 <component name="ToolWindowManager"> 407 <component name="ToolWindowManager">
412 - <frame x="192" y="105" width="1642" height="921" extended-state="1" /> 408 + <frame x="99" y="105" width="1940" height="883" extended-state="1" />
413 <editor active="true" /> 409 <editor active="true" />
414 <layout> 410 <layout>
415 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24968395" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 411 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
416 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> 412 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
417 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> 413 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
418 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 414 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
419 - <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />  
420 - <window_info id="Version Control" 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="1" side_tool="false" content_ui="tabs" />  
421 <window_info id="Run" 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="5" side_tool="false" content_ui="tabs" /> 415 <window_info id="Run" 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="5" side_tool="false" content_ui="tabs" />
  416 + <window_info id="Version Control" 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="1" side_tool="false" content_ui="tabs" />
422 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 417 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
423 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47289973" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
424 - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> 418 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47184986" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
425 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 419 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  420 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
426 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 421 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
427 <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" /> 422 <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
428 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 423 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
429 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> 424 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
430 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" /> 425 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
  426 + <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
431 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 427 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
432 </layout> 428 </layout>
433 <layout-to-restore> 429 <layout-to-restore>
@@ -462,41 +458,11 @@ @@ -462,41 +458,11 @@
462 </component> 458 </component>
463 <component name="XDebuggerManager"> 459 <component name="XDebuggerManager">
464 <breakpoint-manager> 460 <breakpoint-manager>
465 - <option name="time" value="27" /> 461 + <option name="time" value="28" />
466 </breakpoint-manager> 462 </breakpoint-manager>
467 <watches-manager /> 463 <watches-manager />
468 </component> 464 </component>
469 <component name="editorHistoryManager"> 465 <component name="editorHistoryManager">
470 - <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">  
471 - <provider selected="true" editor-type-id="text-editor">  
472 - <state relative-caret-position="100">  
473 - <caret line="91" column="23" lean-forward="false" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />  
474 - </state>  
475 - </provider>  
476 - </entry>  
477 - <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Request.php">  
478 - <provider selected="true" editor-type-id="text-editor">  
479 - <state relative-caret-position="-1315">  
480 - <caret line="716" column="20" lean-forward="false" selection-start-line="716" selection-start-column="20" selection-end-line="716" selection-end-column="20" />  
481 - <folding />  
482 - </state>  
483 - </provider>  
484 - </entry>  
485 - <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">  
486 - <provider selected="true" editor-type-id="text-editor">  
487 - <state relative-caret-position="-115">  
488 - <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />  
489 - <folding />  
490 - </state>  
491 - </provider>  
492 - </entry>  
493 - <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Model.php">  
494 - <provider selected="true" editor-type-id="text-editor">  
495 - <state relative-caret-position="-865">  
496 - <caret line="1695" column="27" lean-forward="false" selection-start-line="1695" selection-start-column="27" selection-end-line="1695" selection-end-column="27" />  
497 - </state>  
498 - </provider>  
499 - </entry>  
500 <entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php"> 466 <entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
501 <provider selected="true" editor-type-id="text-editor"> 467 <provider selected="true" editor-type-id="text-editor">
502 <state relative-caret-position="260"> 468 <state relative-caret-position="260">
@@ -532,14 +498,6 @@ @@ -532,14 +498,6 @@
532 </state> 498 </state>
533 </provider> 499 </provider>
534 </entry> 500 </entry>
535 - <entry file="file://$PROJECT_DIR$/application/config.php">  
536 - <provider selected="true" editor-type-id="text-editor">  
537 - <state relative-caret-position="-5641">  
538 - <caret line="22" column="60" lean-forward="true" selection-start-line="22" selection-start-column="60" selection-end-line="22" selection-end-column="60" />  
539 - <folding />  
540 - </state>  
541 - </provider>  
542 - </entry>  
543 <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> 501 <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
544 <provider selected="true" editor-type-id="text-editor"> 502 <provider selected="true" editor-type-id="text-editor">
545 <state relative-caret-position="531"> 503 <state relative-caret-position="531">
@@ -589,13 +547,6 @@ @@ -589,13 +547,6 @@
589 </state> 547 </state>
590 </provider> 548 </provider>
591 </entry> 549 </entry>
592 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
593 - <provider selected="true" editor-type-id="text-editor">  
594 - <state relative-caret-position="318">  
595 - <caret line="32" column="152" lean-forward="false" selection-start-line="32" selection-start-column="24" selection-end-line="32" selection-end-column="152" />  
596 - </state>  
597 - </provider>  
598 - </entry>  
599 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/cover.js"> 550 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/cover.js">
600 <provider selected="true" editor-type-id="text-editor"> 551 <provider selected="true" editor-type-id="text-editor">
601 <state relative-caret-position="675"> 552 <state relative-caret-position="675">
@@ -603,13 +554,6 @@ @@ -603,13 +554,6 @@
603 </state> 554 </state>
604 </provider> 555 </provider>
605 </entry> 556 </entry>
606 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">  
607 - <provider selected="true" editor-type-id="text-editor">  
608 - <state relative-caret-position="465">  
609 - <caret line="116" column="40" lean-forward="false" selection-start-line="116" selection-start-column="40" selection-end-line="116" selection-end-column="40" />  
610 - </state>  
611 - </provider>  
612 - </entry>  
613 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js"> 557 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">
614 <provider selected="true" editor-type-id="text-editor"> 558 <provider selected="true" editor-type-id="text-editor">
615 <state relative-caret-position="-450"> 559 <state relative-caret-position="-450">
@@ -631,238 +575,265 @@ @@ -631,238 +575,265 @@
631 </state> 575 </state>
632 </provider> 576 </provider>
633 </entry> 577 </entry>
634 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html"> 578 + <entry file="file://$PROJECT_DIR$/application/admin/model/Video.php">
635 <provider selected="true" editor-type-id="text-editor"> 579 <provider selected="true" editor-type-id="text-editor">
636 - <state relative-caret-position="205">  
637 - <caret line="103" column="4" lean-forward="true" selection-start-line="103" selection-start-column="4" selection-end-line="108" selection-end-column="10" /> 580 + <state relative-caret-position="425">
  581 + <caret line="28" column="6" lean-forward="false" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
638 </state> 582 </state>
639 </provider> 583 </provider>
640 </entry> 584 </entry>
641 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/words.php"> 585 + <entry file="file://$PROJECT_DIR$/application/admin/view/type/index.html">
642 <provider selected="true" editor-type-id="text-editor"> 586 <provider selected="true" editor-type-id="text-editor">
643 - <state relative-caret-position="125">  
644 - <caret line="5" column="25" lean-forward="true" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" /> 587 + <state relative-caret-position="0">
  588 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
645 </state> 589 </state>
646 </provider> 590 </provider>
647 </entry> 591 </entry>
648 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html"> 592 + <entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html" />
  593 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Addword.php" />
  594 + <entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json">
649 <provider selected="true" editor-type-id="text-editor"> 595 <provider selected="true" editor-type-id="text-editor">
650 - <state relative-caret-position="314">  
651 - <caret line="109" column="41" lean-forward="true" selection-start-line="109" selection-start-column="41" selection-end-line="109" selection-end-column="41" /> 596 + <state relative-caret-position="-25">
  597 + <caret line="11" column="58" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="58" />
652 </state> 598 </state>
653 </provider> 599 </provider>
654 </entry> 600 </entry>
655 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/words.js"> 601 + <entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.min.js">
656 <provider selected="true" editor-type-id="text-editor"> 602 <provider selected="true" editor-type-id="text-editor">
657 - <state relative-caret-position="200">  
658 - <caret line="29" column="132" lean-forward="true" selection-start-line="29" selection-start-column="132" selection-end-line="29" selection-end-column="132" /> 603 + <state relative-caret-position="-600">
  604 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
659 </state> 605 </state>
660 </provider> 606 </provider>
661 </entry> 607 </entry>
662 - <entry file="file://$PROJECT_DIR$/application/admin/view/words/edit.html"> 608 + <entry file="file://$PROJECT_DIR$/bower.json">
663 <provider selected="true" editor-type-id="text-editor"> 609 <provider selected="true" editor-type-id="text-editor">
664 - <state relative-caret-position="175">  
665 - <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" /> 610 + <state relative-caret-position="225">
  611 + <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
666 </state> 612 </state>
667 </provider> 613 </provider>
668 </entry> 614 </entry>
669 - <entry file="file://$PROJECT_DIR$/application/admin/view/words/add.html"> 615 + <entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/README.md">
  616 + <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
  617 + <state split_layout="SPLIT">
  618 + <first_editor relative-caret-position="0">
  619 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  620 + </first_editor>
  621 + <second_editor />
  622 + </state>
  623 + </provider>
  624 + </entry>
  625 + <entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.js">
670 <provider selected="true" editor-type-id="text-editor"> 626 <provider selected="true" editor-type-id="text-editor">
671 - <state relative-caret-position="275">  
672 - <caret line="11" column="93" lean-forward="false" selection-start-line="11" selection-start-column="93" selection-end-line="11" selection-end-column="93" /> 627 + <state relative-caret-position="-737">
  628 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
673 </state> 629 </state>
674 </provider> 630 </provider>
675 </entry> 631 </entry>
676 - <entry file="file://$PROJECT_DIR$/application/admin/model/Video.php"> 632 + <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-table.js">
  633 + <provider selected="true" editor-type-id="text-editor">
  634 + <state relative-caret-position="525">
  635 + <caret line="30" column="28" lean-forward="true" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />
  636 + </state>
  637 + </provider>
  638 + </entry>
  639 + <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-backend.js">
  640 + <provider selected="true" editor-type-id="text-editor">
  641 + <state relative-caret-position="-900">
  642 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  643 + </state>
  644 + </provider>
  645 + </entry>
  646 + <entry file="file://$PROJECT_DIR$/public/assets/css/backend.css">
  647 + <provider selected="true" editor-type-id="text-editor">
  648 + <state relative-caret-position="84">
  649 + <caret line="987" column="1" lean-forward="true" selection-start-line="987" selection-start-column="1" selection-end-line="987" selection-end-column="1" />
  650 + </state>
  651 + </provider>
  652 + </entry>
  653 + <entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.js">
677 <provider selected="true" editor-type-id="text-editor"> 654 <provider selected="true" editor-type-id="text-editor">
678 <state relative-caret-position="425"> 655 <state relative-caret-position="425">
679 - <caret line="28" column="6" lean-forward="false" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />  
680 - <folding /> 656 + <caret line="92" column="48" lean-forward="false" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />
681 </state> 657 </state>
682 </provider> 658 </provider>
683 </entry> 659 </entry>
684 - <entry file="file://$PROJECT_DIR$/application/admin/view/type/index.html"> 660 + <entry file="file://$PROJECT_DIR$/public/index.php">
685 <provider selected="true" editor-type-id="text-editor"> 661 <provider selected="true" editor-type-id="text-editor">
686 <state relative-caret-position="0"> 662 <state relative-caret-position="0">
687 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 663 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
688 </state> 664 </state>
689 </provider> 665 </provider>
690 </entry> 666 </entry>
691 - <entry file="file://$PROJECT_DIR$/application/admin/view/words/index.html"> 667 + <entry file="file://$PROJECT_DIR$/application/database.php">
692 <provider selected="true" editor-type-id="text-editor"> 668 <provider selected="true" editor-type-id="text-editor">
693 - <state relative-caret-position="325">  
694 - <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />  
695 - <folding /> 669 + <state relative-caret-position="0">
  670 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
696 </state> 671 </state>
697 </provider> 672 </provider>
698 </entry> 673 </entry>
699 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"> 674 + <entry file="file://$PROJECT_DIR$/application/config.php">
700 <provider selected="true" editor-type-id="text-editor"> 675 <provider selected="true" editor-type-id="text-editor">
701 - <state relative-caret-position="275">  
702 - <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />  
703 - <folding /> 676 + <state relative-caret-position="300">
  677 + <caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
704 </state> 678 </state>
705 </provider> 679 </provider>
706 </entry> 680 </entry>
707 - <entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html"> 681 + <entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">
708 <provider selected="true" editor-type-id="text-editor"> 682 <provider selected="true" editor-type-id="text-editor">
709 - <state relative-caret-position="175">  
710 - <caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />  
711 - <folding /> 683 + <state relative-caret-position="25">
  684 + <caret line="1" column="17" lean-forward="true" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
712 </state> 685 </state>
713 </provider> 686 </provider>
714 </entry> 687 </entry>
715 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html"> 688 + <entry file="file://$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js">
716 <provider selected="true" editor-type-id="text-editor"> 689 <provider selected="true" editor-type-id="text-editor">
717 - <state relative-caret-position="430">  
718 - <caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />  
719 - <folding /> 690 + <state relative-caret-position="975">
  691 + <caret line="39" column="15" lean-forward="false" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
720 </state> 692 </state>
721 </provider> 693 </provider>
722 </entry> 694 </entry>
723 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php"> 695 + <entry file="file://$PROJECT_DIR$/public/assets/js/require.js">
724 <provider selected="true" editor-type-id="text-editor"> 696 <provider selected="true" editor-type-id="text-editor">
725 - <state relative-caret-position="93">  
726 - <caret line="83" column="59" lean-forward="true" selection-start-line="83" selection-start-column="59" selection-end-line="83" selection-end-column="59" />  
727 - <folding>  
728 - <element signature="e#40#74#0#PHP" expanded="false" />  
729 - <element signature="e#700#2022#0#PHP" expanded="false" />  
730 - <element signature="e#4170#6464#0#PHP" expanded="false" />  
731 - <element signature="e#7119#12920#0#PHP" expanded="false" />  
732 - </folding> 697 + <state relative-caret-position="0">
  698 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
733 </state> 699 </state>
734 </provider> 700 </provider>
735 </entry> 701 </entry>
736 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php"> 702 + <entry file="file://$PROJECT_DIR$/application/admin/view/words/index.html">
737 <provider selected="true" editor-type-id="text-editor"> 703 <provider selected="true" editor-type-id="text-editor">
738 - <state relative-caret-position="-37">  
739 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
740 - <folding /> 704 + <state relative-caret-position="175">
  705 + <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
741 </state> 706 </state>
742 </provider> 707 </provider>
743 </entry> 708 </entry>
744 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Addword.php"> 709 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
745 <provider selected="true" editor-type-id="text-editor"> 710 <provider selected="true" editor-type-id="text-editor">
746 - <state relative-caret-position="275">  
747 - <caret line="17" column="50" lean-forward="true" selection-start-line="17" selection-start-column="50" selection-end-line="17" selection-end-column="50" />  
748 - <folding /> 711 + <state relative-caret-position="25">
  712 + <caret line="1" column="4" lean-forward="false" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
749 </state> 713 </state>
750 </provider> 714 </provider>
751 </entry> 715 </entry>
752 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> 716 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
753 <provider selected="true" editor-type-id="text-editor"> 717 <provider selected="true" editor-type-id="text-editor">
754 - <state relative-caret-position="200">  
755 - <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />  
756 - <folding /> 718 + <state relative-caret-position="25">
  719 + <caret line="1" column="4" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
757 </state> 720 </state>
758 </provider> 721 </provider>
759 </entry> 722 </entry>
760 - <entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json"> 723 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
761 <provider selected="true" editor-type-id="text-editor"> 724 <provider selected="true" editor-type-id="text-editor">
762 - <state relative-caret-position="-25">  
763 - <caret line="11" column="58" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="58" />  
764 - <folding /> 725 + <state relative-caret-position="293">
  726 + <caret line="16" column="36" lean-forward="true" selection-start-line="16" selection-start-column="36" selection-end-line="16" selection-end-column="36" />
765 </state> 727 </state>
766 </provider> 728 </provider>
767 </entry> 729 </entry>
768 - <entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.min.js"> 730 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/words.js">
769 <provider selected="true" editor-type-id="text-editor"> 731 <provider selected="true" editor-type-id="text-editor">
770 - <state relative-caret-position="-600">  
771 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
772 - <folding>  
773 - <element signature="n#!!doc" expanded="false" />  
774 - </folding> 732 + <state relative-caret-position="125">
  733 + <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
775 </state> 734 </state>
776 </provider> 735 </provider>
777 </entry> 736 </entry>
778 - <entry file="file://$PROJECT_DIR$/bower.json"> 737 + <entry file="file://$PROJECT_DIR$/application/admin/view/words/edit.html">
779 <provider selected="true" editor-type-id="text-editor"> 738 <provider selected="true" editor-type-id="text-editor">
780 - <state relative-caret-position="225">  
781 - <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />  
782 - <folding /> 739 + <state relative-caret-position="100">
  740 + <caret line="4" column="122" lean-forward="false" selection-start-line="4" selection-start-column="122" selection-end-line="4" selection-end-column="122" />
783 </state> 741 </state>
784 </provider> 742 </provider>
785 </entry> 743 </entry>
786 - <entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/README.md">  
787 - <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">  
788 - <state split_layout="SPLIT">  
789 - <first_editor relative-caret-position="0">  
790 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
791 - <folding />  
792 - </first_editor>  
793 - <second_editor /> 744 + <entry file="file://$PROJECT_DIR$/application/admin/view/words/add.html">
  745 + <provider selected="true" editor-type-id="text-editor">
  746 + <state relative-caret-position="100">
  747 + <caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="30" />
794 </state> 748 </state>
795 </provider> 749 </provider>
796 </entry> 750 </entry>
797 - <entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.js"> 751 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
798 <provider selected="true" editor-type-id="text-editor"> 752 <provider selected="true" editor-type-id="text-editor">
799 - <state relative-caret-position="-737">  
800 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
801 - <folding /> 753 + <state relative-caret-position="225">
  754 + <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
802 </state> 755 </state>
803 </provider> 756 </provider>
804 </entry> 757 </entry>
805 - <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-table.js"> 758 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/words.php">
806 <provider selected="true" editor-type-id="text-editor"> 759 <provider selected="true" editor-type-id="text-editor">
807 - <state relative-caret-position="525">  
808 - <caret line="30" column="28" lean-forward="true" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />  
809 - <folding /> 760 + <state relative-caret-position="100">
  761 + <caret line="4" column="6" lean-forward="false" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
810 </state> 762 </state>
811 </provider> 763 </provider>
812 </entry> 764 </entry>
813 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> 765 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Category.php">
814 <provider selected="true" editor-type-id="text-editor"> 766 <provider selected="true" editor-type-id="text-editor">
815 - <state relative-caret-position="275">  
816 - <caret line="11" column="45" lean-forward="false" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />  
817 - <folding /> 767 + <state relative-caret-position="254">
  768 + <caret line="134" column="0" lean-forward="true" selection-start-line="134" selection-start-column="0" selection-end-line="144" selection-end-column="5" />
818 </state> 769 </state>
819 </provider> 770 </provider>
820 </entry> 771 </entry>
821 - <entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js"> 772 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php">
822 <provider selected="true" editor-type-id="text-editor"> 773 <provider selected="true" editor-type-id="text-editor">
823 - <state relative-caret-position="-25">  
824 - <caret line="29" column="29" lean-forward="true" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />  
825 - <folding>  
826 - <marker date="1583401745828" expanded="true" signature="26283:26309" ph="..." />  
827 - </folding> 774 + <state relative-caret-position="1275">
  775 + <caret line="51" column="32" lean-forward="true" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
828 </state> 776 </state>
829 </provider> 777 </provider>
830 </entry> 778 </entry>
831 - <entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.js"> 779 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
832 <provider selected="true" editor-type-id="text-editor"> 780 <provider selected="true" editor-type-id="text-editor">
833 - <state relative-caret-position="425">  
834 - <caret line="92" column="48" lean-forward="true" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />  
835 - <folding>  
836 - <element signature="e#3390#3492#0" expanded="false" />  
837 - <element signature="e#3528#3645#0" expanded="false" />  
838 - <element signature="e#3681#3783#0" expanded="false" />  
839 - <element signature="e#3827#3929#0" expanded="false" />  
840 - <element signature="e#3971#4073#0" expanded="false" />  
841 - <element signature="e#4111#4225#0" expanded="false" />  
842 - </folding> 781 + <state relative-caret-position="131">
  782 + <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
843 </state> 783 </state>
844 </provider> 784 </provider>
845 </entry> 785 </entry>
846 - <entry file="file://$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js"> 786 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
847 <provider selected="true" editor-type-id="text-editor"> 787 <provider selected="true" editor-type-id="text-editor">
848 - <state relative-caret-position="308">  
849 - <caret line="39" column="15" lean-forward="true" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />  
850 - <folding /> 788 + <state relative-caret-position="300">
  789 + <caret line="47" column="0" lean-forward="true" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
851 </state> 790 </state>
852 </provider> 791 </provider>
853 </entry> 792 </entry>
854 - <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-backend.js"> 793 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
855 <provider selected="true" editor-type-id="text-editor"> 794 <provider selected="true" editor-type-id="text-editor">
856 - <state relative-caret-position="-900">  
857 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
858 - <folding /> 795 + <state relative-caret-position="475">
  796 + <caret line="165" column="85" lean-forward="true" selection-start-line="165" selection-start-column="85" selection-end-line="165" selection-end-column="85" />
859 </state> 797 </state>
860 </provider> 798 </provider>
861 </entry> 799 </entry>
862 - <entry file="file://$PROJECT_DIR$/public/assets/css/backend.css"> 800 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
863 <provider selected="true" editor-type-id="text-editor"> 801 <provider selected="true" editor-type-id="text-editor">
864 - <state relative-caret-position="431">  
865 - <caret line="1002" column="19" lean-forward="true" selection-start-line="1002" selection-start-column="19" selection-end-line="1002" selection-end-column="19" /> 802 + <state relative-caret-position="25">
  803 + <caret line="705" column="0" lean-forward="false" selection-start-line="705" selection-start-column="0" selection-end-line="705" selection-end-column="0" />
  804 + <folding>
  805 + <element signature="e#506#1244#0#PHP" expanded="false" />
  806 + <element signature="e#1249#2912#0#PHP" expanded="false" />
  807 + <element signature="e#2918#3280#0#PHP" expanded="false" />
  808 + <element signature="e#3285#3575#0#PHP" expanded="false" />
  809 + <element signature="e#3582#4016#0#PHP" expanded="false" />
  810 + <element signature="e#4021#4379#0#PHP" expanded="false" />
  811 + <element signature="e#4385#4792#0#PHP" expanded="false" />
  812 + <element signature="e#4797#5140#0#PHP" expanded="false" />
  813 + <element signature="e#5146#5559#0#PHP" expanded="false" />
  814 + <element signature="e#5564#5881#0#PHP" expanded="false" />
  815 + <element signature="e#5887#6724#0#PHP" expanded="false" />
  816 + <element signature="e#6729#8924#0#PHP" expanded="false" />
  817 + <element signature="e#8930#9610#0#PHP" expanded="false" />
  818 + <element signature="e#9615#10528#0#PHP" expanded="false" />
  819 + <element signature="e#10534#11323#0#PHP" expanded="false" />
  820 + <element signature="e#11328#12677#0#PHP" expanded="false" />
  821 + <element signature="e#12683#13385#0#PHP" expanded="false" />
  822 + <element signature="e#13390#14710#0#PHP" expanded="false" />
  823 + <element signature="e#14716#15292#0#PHP" expanded="false" />
  824 + <element signature="e#15297#15909#0#PHP" expanded="false" />
  825 + <element signature="e#19182#20084#0#PHP" expanded="false" />
  826 + <element signature="e#20089#22907#0#PHP" expanded="false" />
  827 + <element signature="e#22913#23290#0#PHP" expanded="false" />
  828 + <element signature="e#23295#23737#0#PHP" expanded="false" />
  829 + </folding>
  830 + </state>
  831 + </provider>
  832 + </entry>
  833 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  834 + <provider selected="true" editor-type-id="text-editor">
  835 + <state relative-caret-position="75">
  836 + <caret line="158" column="28" lean-forward="false" selection-start-line="158" selection-start-column="28" selection-end-line="158" selection-end-column="28" />
866 <folding /> 837 <folding />
867 </state> 838 </state>
868 </provider> 839 </provider>
@@ -61,8 +61,10 @@ class Video extends Backend @@ -61,8 +61,10 @@ class Video extends Backend
61 $type = new \app\admin\model\Type(); 61 $type = new \app\admin\model\Type();
62 $words = new \app\admin\model\Words(); 62 $words = new \app\admin\model\Words();
63 foreach ($list as &$v){ 63 foreach ($list as &$v){
64 - $words_ids = $words->whereIn('id',$v['words_ids'])->column('name');  
65 - $v['words_ids'] = implode(',',$words_ids); 64 + $text_ids = $words->whereIn('id',$v['text_ids'])->column('name');
  65 + $v['text_ids'] = implode(',',$text_ids);
  66 + $address_ids = $words->whereIn('id',$v['address_ids'])->column('name');
  67 + $v['address_ids'] = implode(',',$address_ids);
66 $type_ids = $type->whereIn('id',$v['type_ids'])->column('area_name'); 68 $type_ids = $type->whereIn('id',$v['type_ids'])->column('area_name');
67 $v['type_ids'] = implode(',',$type_ids); 69 $v['type_ids'] = implode(',',$type_ids);
68 } 70 }
@@ -82,13 +84,31 @@ class Video extends Backend @@ -82,13 +84,31 @@ class Video extends Backend
82 $params = $this->request->post("row/a"); 84 $params = $this->request->post("row/a");
83 if ($params) { 85 if ($params) {
84 $params = $this->preExcludeFields($params); 86 $params = $this->preExcludeFields($params);
85 - $count = count(explode(',',$params['words_ids'])); 87 +
  88 + //如果内容关键字和地名关键字都为空
  89 + if($params['text_ids'] == '' && $params['address_ids'] == ''){
  90 + $this->error('请选择关键字标签');
  91 + }
  92 + //内容关键字不为空
  93 + if($params['text_ids'] != ''){
  94 + $count_text = count(explode(',',$params['text_ids']));
  95 + $params['text_ids'] =','.$params['text_ids'].',';
  96 + }else{
  97 + $count_text = 0;
  98 + }
  99 + //地名关键字不为空
  100 + if($params['address_ids'] != ''){
  101 + $count_address = count(explode(',',$params['address_ids']));
  102 + $params['address_ids'] =','.$params['address_ids'].',';
  103 + }else{
  104 + $count_address = 0;
  105 + }
  106 + $count = $count_text + $count_address;
86 if($count>=3){ 107 if($count>=3){
87 true; 108 true;
88 }else{ 109 }else{
89 $this->error('至少选择三个关键字标签'); 110 $this->error('至少选择三个关键字标签');
90 } 111 }
91 - $params['words_ids'] =','.$params['words_ids'].',';  
92 $params['type_ids'] =','.$params['type_ids'].','; 112 $params['type_ids'] =','.$params['type_ids'].',';
93 if ($this->dataLimit && $this->dataLimitFieldAutoFill) { 113 if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
94 $params[$this->dataLimitField] = $this->auth->id; 114 $params[$this->dataLimitField] = $this->auth->id;
@@ -142,14 +162,32 @@ class Video extends Backend @@ -142,14 +162,32 @@ class Video extends Backend
142 } 162 }
143 if ($this->request->isPost()) { 163 if ($this->request->isPost()) {
144 $params = $this->request->post("row/a"); 164 $params = $this->request->post("row/a");
  165 +// print_r($params);die;
145 $params['type_ids'] =','.$params['type_ids'].','; 166 $params['type_ids'] =','.$params['type_ids'].',';
146 - $count = count(explode(',',$params['words_ids'])); 167 + //如果内容关键字和地名关键字都为空
  168 + if($params['text_ids'] == '' && $params['address_ids'] == ''){
  169 + $this->error('请选择关键字标签');
  170 + }
  171 + //内容关键字不为空
  172 + if($params['text_ids'] != ''){
  173 + $count_text = count(explode(',',$params['text_ids']));
  174 + $params['text_ids'] =','.$params['text_ids'].',';
  175 + }else{
  176 + $count_text = 0;
  177 + }
  178 + //地名关键字不为空
  179 + if($params['address_ids'] != ''){
  180 + $count_address = count(explode(',',$params['address_ids']));
  181 + $params['address_ids'] =','.$params['address_ids'].',';
  182 + }else{
  183 + $count_address = 0;
  184 + }
  185 + $count = $count_text + $count_address;
147 if($count>=3){ 186 if($count>=3){
148 true; 187 true;
149 }else{ 188 }else{
150 $this->error('至少选择三个关键字标签'); 189 $this->error('至少选择三个关键字标签');
151 } 190 }
152 - $params['words_ids'] =','.$params['words_ids'].',';  
153 if ($params) { 191 if ($params) {
154 $params = $this->preExcludeFields($params); 192 $params = $this->preExcludeFields($params);
155 $result = false; 193 $result = false;
@@ -194,8 +232,18 @@ class Video extends Backend @@ -194,8 +232,18 @@ class Video extends Backend
194 return json($arr); 232 return json($arr);
195 } 233 }
196 234
197 - public function words(){  
198 - $res = Db::name('words')->field('id,type,name')->select(); 235 + public function text(){
  236 + $res = Db::name('words')->where('type',2)->field('id,type,name')->select();
  237 + $arr = [];
  238 + foreach($res as $key=>$value){
  239 + $arr[$value['id']] = $value['name'];
  240 + }
  241 + return json($arr);
  242 + }
  243 +
  244 + public function address()
  245 + {
  246 + $res = Db::name('words')->where('type',1)->field('id,type,name')->select();
199 $arr = []; 247 $arr = [];
200 foreach($res as $key=>$value){ 248 foreach($res as $key=>$value){
201 $arr[$value['id']] = $value['name']; 249 $arr[$value['id']] = $value['name'];
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace app\admin\controller; 3 namespace app\admin\controller;
4 4
5 use app\common\controller\Backend; 5 use app\common\controller\Backend;
  6 +use think\Db;
6 7
7 /** 8 /**
8 * 全部关键字管理 9 * 全部关键字管理
@@ -17,6 +18,7 @@ class Words extends Backend @@ -17,6 +18,7 @@ class Words extends Backend
17 * @var \app\admin\model\Words 18 * @var \app\admin\model\Words
18 */ 19 */
19 protected $model = null; 20 protected $model = null;
  21 + protected $noNeedRight = ['selectpage'];
20 22
21 public function _initialize() 23 public function _initialize()
22 { 24 {
@@ -31,5 +33,25 @@ class Words extends Backend @@ -31,5 +33,25 @@ class Words extends Backend
31 * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 33 * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
32 */ 34 */
33 35
  36 + public function text()
  37 + {
  38 + $res = Db::name('words')->where('type',2)->field('id,type,name')->select();
  39 + $arr = [];
  40 + foreach($res as $key=>$value){
  41 + $arr[$value['id']] = $value['name'];
  42 + }
  43 + return $arr;
  44 + }
  45 +
  46 +
  47 + /**
  48 + * Selectpage搜索
  49 + *
  50 + * @internal
  51 + */
  52 + public function selectpage()
  53 + {
  54 + return parent::selectpage();
  55 + }
34 56
35 } 57 }
@@ -9,7 +9,8 @@ return [ @@ -9,7 +9,8 @@ return [
9 'Thumbnail' => '视频封面图', 9 'Thumbnail' => '视频封面图',
10 'Share' =>'分享到小程序的封面', 10 'Share' =>'分享到小程序的封面',
11 'Type_ids' => '地区标签', 11 'Type_ids' => '地区标签',
12 - 'Words_ids' =>'关键字标签', 12 + 'text_ids' =>'内容关键字标签',
  13 + 'Address_ids' =>'地名关键字标签',
13 'Video' => '2K视频', 14 'Video' => '2K视频',
14 'Water_url' => '带水印云盘地址', 15 'Water_url' => '带水印云盘地址',
15 'Two_url' => '2k视频地址', 16 'Two_url' => '2k视频地址',
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 return [ 3 return [
4 'Id' => 'id', 4 'Id' => 'id',
  5 + 'Weigh' =>'权重值',
5 'Name' => '关键词', 6 'Name' => '关键词',
6 'Type' => '类型', 7 'Type' => '类型',
7 'Createtime' => '创建时间', 8 'Createtime' => '创建时间',
@@ -18,9 +18,15 @@ @@ -18,9 +18,15 @@
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="form-group"> 20 <div class="form-group">
21 - <label class="control-label col-xs-12 col-sm-2">{:__('Words_ids')}:</label> 21 + <label class="control-label col-xs-12 col-sm-2">{:__('Text_ids')}:</label>
22 <div class="col-xs-12 col-sm-8"> 22 <div class="col-xs-12 col-sm-8">
23 - <input id="c-words_ids" data-rule="required" data-source="words/index" data-multiple="true" data-field="name" class="form-control selectpage" name="row[words_ids]" type="text" value=""> 23 + <input id="c-text_ids" data-source="words/selectpage" data-multiple="true" data-field="name" data-params='{"custom[type]":"2"}' class="form-control selectpage" name="row[text_ids]" type="text" value="">
  24 + </div>
  25 + </div>
  26 + <div class="form-group">
  27 + <label class="control-label col-xs-12 col-sm-2">{:__('Address_ids')}:</label>
  28 + <div class="col-xs-12 col-sm-8">
  29 + <input id="c-address_ids" data-source="words/selectpage" data-multiple="true" data-field="name" data-params='{"custom[type]":"1"}' class="form-control selectpage" name="row[address_ids]" type="text" value="">
24 </div> 30 </div>
25 </div> 31 </div>
26 <div class="form-group"> 32 <div class="form-group">
@@ -125,22 +131,41 @@ @@ -125,22 +131,41 @@
125 <textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍"></textarea> 131 <textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍"></textarea>
126 </div> 132 </div>
127 </div> 133 </div>
  134 + <!--<div class="form-group">-->
  135 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>-->
  136 + <!--<div class="col-xs-12 col-sm-8">-->
  137 + <!--<input id="c-price" class="form-control" name="row[price]" type="text" placeholder="请输入2k普通价格">-->
  138 + <!--</div>-->
  139 + <!--</div>-->
  140 +
  141 + <!--<div class="form-group">-->
  142 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>-->
  143 + <!--<div class="col-xs-12 col-sm-8">-->
  144 + <!--<input id="c-four_price" class="form-control" name="row[four_price]" type="text" placeholder="请输入4k普通价格">-->
  145 + <!--</div>-->
  146 + <!--</div>-->
  147 + <!--<div class="form-group">-->
  148 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>-->
  149 + <!--<div class="col-xs-12 col-sm-8">-->
  150 + <!--<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" placeholder="请输入8k普通价格">-->
  151 + <!--</div>-->
  152 + <!--</div>-->
128 <div class="form-group"> 153 <div class="form-group">
129 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 154 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
130 <div class="col-xs-12 col-sm-8"> 155 <div class="col-xs-12 col-sm-8">
131 - <input id="c-price" class="form-control" name="row[price]" type="text" placeholder="请输入2k普通价格"> 156 + {:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')])}
132 </div> 157 </div>
133 </div> 158 </div>
134 <div class="form-group"> 159 <div class="form-group">
135 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label> 160 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
136 <div class="col-xs-12 col-sm-8"> 161 <div class="col-xs-12 col-sm-8">
137 - <input id="c-four_price" class="form-control" name="row[four_price]" type="text" placeholder="请输入4k普通价格"> 162 + {:build_radios('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')])}
138 </div> 163 </div>
139 </div> 164 </div>
140 <div class="form-group"> 165 <div class="form-group">
141 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label> 166 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
142 <div class="col-xs-12 col-sm-8"> 167 <div class="col-xs-12 col-sm-8">
143 - <input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" placeholder="请输入8k普通价格"> 168 + {:build_radios('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')])}
144 </div> 169 </div>
145 </div> 170 </div>
146 <div class="form-group"> 171 <div class="form-group">
@@ -18,9 +18,15 @@ @@ -18,9 +18,15 @@
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="form-group"> 20 <div class="form-group">
21 - <label class="control-label col-xs-12 col-sm-2">{:__('Words_ids')}:</label> 21 + <label class="control-label col-xs-12 col-sm-2">{:__('Text_ids')}:</label>
22 <div class="col-xs-12 col-sm-8"> 22 <div class="col-xs-12 col-sm-8">
23 - <input id="c-words_ids" data-rule="required" data-source="words/index" data-multiple="true" data-field="name" class="form-control selectpage" name="row[words_ids]" type="text" value="{$row.words_ids}"> 23 + <input id="c-text_ids" data-source="words/index" data-multiple="true" data-field="name" data-params='{"custom[type]":"2"}' class="form-control selectpage" name="row[text_ids]" type="text" value="{$row.text_ids}">
  24 + </div>
  25 + </div>
  26 + <div class="form-group">
  27 + <label class="control-label col-xs-12 col-sm-2">{:__('Address_ids')}:</label>
  28 + <div class="col-xs-12 col-sm-8">
  29 + <input id="c-address_ids" data-source="words/index" data-multiple="true" data-field="name" data-params='{"custom[type]":"1"}' class="form-control selectpage" name="row[address_ids]" type="text" value="{$row.address_ids}">
24 </div> 30 </div>
25 </div> 31 </div>
26 <div class="form-group"> 32 <div class="form-group">
@@ -125,24 +131,45 @@ @@ -125,24 +131,45 @@
125 <textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍">{$row.content}</textarea> 131 <textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍">{$row.content}</textarea>
126 </div> 132 </div>
127 </div> 133 </div>
  134 + <!--<div class="form-group">-->
  135 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>-->
  136 + <!--<div class="col-xs-12 col-sm-8">-->
  137 + <!--<input id="c-price" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入2k普通价格">-->
  138 + <!--</div>-->
  139 + <!--</div>-->
  140 + <!--<div class="form-group">-->
  141 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>-->
  142 + <!--<div class="col-xs-12 col-sm-8">-->
  143 + <!--<input id="c-four_price" class="form-control" name="row[four_price]" type="text" value="{$row.four_price}" placeholder="请输入4k普通价格">-->
  144 + <!--</div>-->
  145 + <!--</div>-->
  146 + <!--<div class="form-group">-->
  147 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>-->
  148 + <!--<div class="col-xs-12 col-sm-8">-->
  149 + <!--<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" value="{$row.eight_price}" placeholder="请输入8k普通价格">-->
  150 + <!--</div>-->
  151 + <!--</div>-->
  152 +
128 <div class="form-group"> 153 <div class="form-group">
129 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 154 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
130 <div class="col-xs-12 col-sm-8"> 155 <div class="col-xs-12 col-sm-8">
131 - <input id="c-price" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入2k普通价格"> 156 + {:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800元')],$row['price'])}
132 </div> 157 </div>
133 </div> 158 </div>
134 <div class="form-group"> 159 <div class="form-group">
135 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label> 160 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
136 <div class="col-xs-12 col-sm-8"> 161 <div class="col-xs-12 col-sm-8">
137 - <input id="c-four_price" class="form-control" name="row[four_price]" type="text" value="{$row.four_price}" placeholder="请输入4k普通价格"> 162 + {:build_radios('row[four_price]', ['1200'=>__('1200元'), '2000'=>__('2000元'),'2800'=>__('2800元')],$row['four_price'])}
138 </div> 163 </div>
139 </div> 164 </div>
140 <div class="form-group"> 165 <div class="form-group">
141 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label> 166 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
142 <div class="col-xs-12 col-sm-8"> 167 <div class="col-xs-12 col-sm-8">
143 - <input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" value="{$row.eight_price}" placeholder="请输入8k普通价格"> 168 + {:build_radios('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])}
144 </div> 169 </div>
145 </div> 170 </div>
  171 +
  172 +
146 <div class="form-group"> 173 <div class="form-group">
147 <label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label> 174 <label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label>
148 <div class="col-xs-12 col-sm-8"> 175 <div class="col-xs-12 col-sm-8">
1 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 - 2 + <div class="form-group">
  3 + <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
  4 + <div class="col-xs-12 col-sm-8">
  5 + <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="text" placeholder="请输入权重值">
  6 + </div>
  7 + </div>
3 <div class="form-group"> 8 <div class="form-group">
4 <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label> 9 <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
5 <div class="col-xs-12 col-sm-8"> 10 <div class="col-xs-12 col-sm-8">
@@ -9,7 +14,7 @@ @@ -9,7 +14,7 @@
9 <div class="form-group"> 14 <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label> 15 <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
11 <div class="col-xs-12 col-sm-8"> 16 <div class="col-xs-12 col-sm-8">
12 - {:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词'),'3'=>__('价格关键词')])} 17 + {:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词')])}
13 </div> 18 </div>
14 </div> 19 </div>
15 <div class="form-group layer-footer"> 20 <div class="form-group layer-footer">
1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 - 2 + <div class="form-group">
  3 + <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
  4 + <div class="col-xs-12 col-sm-8">
  5 + <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="text" value="{$row.weigh|htmlentities}" placeholder="请输入权重值">
  6 + </div>
  7 + </div>
3 <div class="form-group"> 8 <div class="form-group">
4 <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label> 9 <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
5 <div class="col-xs-12 col-sm-8"> 10 <div class="col-xs-12 col-sm-8">
@@ -9,7 +14,7 @@ @@ -9,7 +14,7 @@
9 <div class="form-group"> 14 <div class="form-group">
10 <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label> 15 <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
11 <div class="col-xs-12 col-sm-8"> 16 <div class="col-xs-12 col-sm-8">
12 - {:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词'),'3'=>__('价格关键词')],$row['type'])} 17 + {:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词')],$row['type'])}
13 </div> 18 </div>
14 </div> 19 </div>
15 <div class="form-group layer-footer"> 20 <div class="form-group layer-footer">
@@ -15,7 +15,7 @@ use fast\Http; @@ -15,7 +15,7 @@ use fast\Http;
15 */ 15 */
16 class User extends Api 16 class User extends Api
17 { 17 {
18 - protected $noNeedLogin = ['login','index','type','mine','car','cover']; 18 + protected $noNeedLogin = ['login','index','type','mine','car','cover','words'];
19 protected $noNeedRight = '*'; 19 protected $noNeedRight = '*';
20 protected $uid = ''; 20 protected $uid = '';
21 21
@@ -670,10 +670,10 @@ class User extends Api @@ -670,10 +670,10 @@ class User extends Api
670 } 670 }
671 671
672 /** 672 /**
673 - * @ApiTitle (历史记录)  
674 - * @ApiSummary (历史记录) 673 + * @ApiTitle (搜索关键词内容)
  674 + * @ApiSummary (搜索关键词内容)
675 * @ApiMethod (POST) 675 * @ApiMethod (POST)
676 - * @ApiRoute (/api/user/history) 676 + * @ApiRoute (/api/user/words)
677 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") 677 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
678 * 678 *
679 * @ApiReturn({ 679 * @ApiReturn({
@@ -681,23 +681,59 @@ class User extends Api @@ -681,23 +681,59 @@ class User extends Api
681 "msg": "成功", 681 "msg": "成功",
682 "time": "1571492001", 682 "time": "1571492001",
683 "data": { 683 "data": {
684 - "id": 4,//记录id,  
685 - "title"://搜索的内容 684 + "id"://记录id,
  685 + "name"://关键字名称
686 } 686 }
687 }) 687 })
688 */ 688 */
689 - public function history() 689 + public function words()
690 { 690 {
691 - $user_id = $this->uid;  
692 - $data = Db::name('history')  
693 - ->where('user_id',$user_id)  
694 - ->order('id desc')  
695 - ->column('title');  
696 - $res = array_unique($data);  
697 - $res = array_slice($res,0,10);  
698 - $this->success('SUCCESS',$res); 691 + $data['address'] = Db::name('words')
  692 + ->where('type',1)
  693 + ->field('id,name')
  694 + ->select();
  695 + $data['text'] = Db::name('words')
  696 + ->where('type',2)
  697 + ->field('id,name')
  698 + ->select();
  699 + $data['price'] = [
  700 + '0'=>'800元',
  701 + '1'=>'1200元',
  702 + '2'=>'1800元',
  703 + ];
  704 + $this->success('success',$data);
699 } 705 }
700 706
  707 +
  708 +// /**
  709 +// * @ApiTitle (历史记录)
  710 +// * @ApiSummary (历史记录)
  711 +// * @ApiMethod (POST)
  712 +// * @ApiRoute (/api/user/history)
  713 +// * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  714 +// *
  715 +// * @ApiReturn({
  716 +// "code": 1,
  717 +// "msg": "成功",
  718 +// "time": "1571492001",
  719 +// "data": {
  720 +// "id": 4,//记录id,
  721 +// "title"://搜索的内容
  722 +// }
  723 +// })
  724 +// */
  725 +// public function history()
  726 +// {
  727 +// $user_id = $this->uid;
  728 +// $data = Db::name('history')
  729 +// ->where('user_id',$user_id)
  730 +// ->order('id desc')
  731 +// ->column('title');
  732 +// $res = array_unique($data);
  733 +// $res = array_slice($res,0,10);
  734 +// $this->success('SUCCESS',$res);
  735 +// }
  736 +
701 /** 737 /**
702 * @ApiTitle (我的) 738 * @ApiTitle (我的)
703 * @ApiSummary (我的) 739 * @ApiSummary (我的)
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 <a href="javascript:;" data-id="35" class="list-group-item">会员须知</a> 202 <a href="javascript:;" data-id="35" class="list-group-item">会员须知</a>
203 <a href="javascript:;" data-id="28" class="list-group-item">图片详情</a> 203 <a href="javascript:;" data-id="28" class="list-group-item">图片详情</a>
204 <a href="javascript:;" data-id="29" class="list-group-item">视频详情</a> 204 <a href="javascript:;" data-id="29" class="list-group-item">视频详情</a>
205 - <a href="javascript:;" data-id="30" class="list-group-item">历史记录</a> 205 + <a href="javascript:;" data-id="30" class="list-group-item">搜索关键词内容</a>
206 <a href="javascript:;" data-id="31" class="list-group-item">我的</a> 206 <a href="javascript:;" data-id="31" class="list-group-item">我的</a>
207 <a href="javascript:;" data-id="32" class="list-group-item">创建充值订单</a> 207 <a href="javascript:;" data-id="32" class="list-group-item">创建充值订单</a>
208 <a href="javascript:;" data-id="33" class="list-group-item">创建开通会员订单</a> 208 <a href="javascript:;" data-id="33" class="list-group-item">创建开通会员订单</a>
@@ -6643,7 +6643,7 @@ @@ -6643,7 +6643,7 @@
6643 <div class="panel-heading" id="heading-30"> 6643 <div class="panel-heading" id="heading-30">
6644 <h4 class="panel-title"> 6644 <h4 class="panel-title">
6645 <span class="label label-primary">POST</span> 6645 <span class="label label-primary">POST</span>
6646 - <a data-toggle="collapse" data-parent="#accordion30" href="#collapseOne30"> 历史记录 <span class="text-muted">/api/user/history</span></a> 6646 + <a data-toggle="collapse" data-parent="#accordion30" href="#collapseOne30"> 搜索关键词内容 <span class="text-muted">/api/user/words</span></a>
6647 </h4> 6647 </h4>
6648 </div> 6648 </div>
6649 <div id="collapseOne30" class="panel-collapse collapse"> 6649 <div id="collapseOne30" class="panel-collapse collapse">
@@ -6661,7 +6661,7 @@ @@ -6661,7 +6661,7 @@
6661 6661
6662 <div class="tab-pane active" id="info30"> 6662 <div class="tab-pane active" id="info30">
6663 <div class="well"> 6663 <div class="well">
6664 - 历史记录 </div> 6664 + 搜索关键词内容 </div>
6665 <div class="panel panel-default"> 6665 <div class="panel panel-default">
6666 <div class="panel-heading"><strong>Headers</strong></div> 6666 <div class="panel-heading"><strong>Headers</strong></div>
6667 <div class="panel-body"> 6667 <div class="panel-body">
@@ -6715,7 +6715,7 @@ @@ -6715,7 +6715,7 @@
6715 <div class="panel panel-default"> 6715 <div class="panel panel-default">
6716 <div class="panel-heading"><strong>参数</strong></div> 6716 <div class="panel-heading"><strong>参数</strong></div>
6717 <div class="panel-body"> 6717 <div class="panel-body">
6718 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/history" method="POST" name="form30" id="form30"> 6718 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/words" method="POST" name="form30" id="form30">
6719 <div class="form-group"> 6719 <div class="form-group">
6720 无 6720 无
6721 </div> 6721 </div>
@@ -6755,8 +6755,8 @@ @@ -6755,8 +6755,8 @@
6755 "msg": "成功", 6755 "msg": "成功",
6756 "time": "1571492001", 6756 "time": "1571492001",
6757 "data": { 6757 "data": {
6758 - "id": 4,//记录id,  
6759 - "title"://搜索的内容 6758 + "id"://记录id,
  6759 + "name"://关键字名称
6760 } 6760 }
6761 }</pre> 6761 }</pre>
6762 </div> 6762 </div>
@@ -7471,7 +7471,7 @@ @@ -7471,7 +7471,7 @@
7471 7471
7472 <div class="row mt0 footer"> 7472 <div class="row mt0 footer">
7473 <div class="col-md-6" align="left"> 7473 <div class="col-md-6" align="left">
7474 - Generated on 2020-03-05 16:29:35 </div> 7474 + Generated on 2020-03-06 15:59:59 </div>
7475 <div class="col-md-6" align="right"> 7475 <div class="col-md-6" align="right">
7476 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 7476 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
7477 </div> 7477 </div>
@@ -29,7 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -29,7 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
29 {field: 'number', title: __('Number')}, 29 {field: 'number', title: __('Number')},
30 {field: 'is_show', title: __('Is_show'),operate:false}, 30 {field: 'is_show', title: __('Is_show'),operate:false},
31 {field: 'title', title: __('Title'),operate:false}, 31 {field: 'title', title: __('Title'),operate:false},
32 - {field: 'words_ids', title: __('Words_ids'),searchList:$.getJSON('video/words')}, 32 + {field: 'text_ids', title: __('Text_ids'),searchList:$.getJSON('video/text')},
  33 + {field: 'address_ids', title: __('Address_ids'),searchList:$.getJSON('video/address')},
33 {field: 'keyword', title: __('Keyword'),operate:false}, 34 {field: 'keyword', title: __('Keyword'),operate:false},
34 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 35 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
35 {field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 36 {field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
@@ -44,9 +45,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -44,9 +45,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
44 {field: 'buy_num', title: __('Buy_num'),operate:false}, 45 {field: 'buy_num', title: __('Buy_num'),operate:false},
45 {field: 'money', title: __('Money'),operate:false}, 46 {field: 'money', title: __('Money'),operate:false},
46 {field: 'click_num', title: __('Click_num'),operate:false}, 47 {field: 'click_num', title: __('Click_num'),operate:false},
47 - {field: 'price', title: __('Price'),operate:false},  
48 - {field: 'four_price', title: __('Four_price'),operate:false},  
49 - {field: 'eight_price', title: __('Eight_price'),operate:false}, 48 +
  49 + // {field: 'price', title: __('Price'),operate:false},
  50 + // {field: 'four_price', title: __('Four_price'),operate:false},
  51 + // {field: 'eight_price', title: __('Eight_price'),operate:false},
  52 + {field: 'price', title: __('Price'),formatter: Table.api.formatter.label,searchList:{'800': '800', '1200': '1200','1800':'1800'}},
  53 + {field: 'four_price', title: __('Four_price'),formatter: Table.api.formatter.label,searchList:{'1200': '1200', '2000': '2000','2800':'2800'}},
  54 + {field: 'eight_price', title: __('Eight_price'),formatter: Table.api.formatter.label,searchList:{'800': '800', '1200': '1200','1800':'1800'}},
  55 +
50 {field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}}, 56 {field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
51 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 57 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
52 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 58 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
@@ -20,15 +20,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -20,15 +20,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
20 table.bootstrapTable({ 20 table.bootstrapTable({
21 url: $.fn.bootstrapTable.defaults.extend.index_url, 21 url: $.fn.bootstrapTable.defaults.extend.index_url,
22 pk: 'id', 22 pk: 'id',
23 - sortName: 'id', 23 + sortName: 'weigh',
  24 + sortOrder:'desc',
24 columns: [ 25 columns: [
25 [ 26 [
26 {checkbox: true}, 27 {checkbox: true},
27 {field: 'id', title: __('Id')}, 28 {field: 'id', title: __('Id')},
  29 + // {field: 'is_show', title: __('Is_show'),operate:false},
28 {field: 'name', title: __('Name')}, 30 {field: 'name', title: __('Name')},
29 - {field: 'type', title: __('Type'),formatter: Table.api.formatter.status,searchList:{'1': '地名关键词','2':'内容关键词','3':'价格关键词'}},  
30 - {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},  
31 - {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 31 + {field: 'type', title: __('Type'),formatter: Table.api.formatter.status,searchList:{'1': '地名关键词','2':'内容关键词'}},
  32 + // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  33 + // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
32 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 34 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
33 ] 35 ]
34 ] 36 ]