郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 4dc276aee06a93870c0415e18ef613db12d44073 1 个父辈 23a448fd
1 个管道 的构建 失败 耗费 9 秒

修改首页显示大片规则

内嵌 并排对比
正在显示 10 个修改的文件 包含 421 行增加 和 294 行删除
@@ -2,7 +2,16 @@ @@ -2,7 +2,16 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" afterPath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/site.php" afterPath="$PROJECT_DIR$/application/extra/site.php" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> 12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
6 </list> 15 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 17 <option name="TRACKING_ENABLED" value="true" />
@@ -12,90 +21,121 @@ @@ -12,90 +21,121 @@
12 <option name="LAST_RESOLUTION" value="IGNORE" /> 21 <option name="LAST_RESOLUTION" value="IGNORE" />
13 </component> 22 </component>
14 <component name="FileEditorManager"> 23 <component name="FileEditorManager">
15 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">  
16 - <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> 24 + <leaf>
  25 + <file leaf-file-name="Wonderful.php" pinned="false" current-in-tab="false">
  26 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
  27 + <provider selected="true" editor-type-id="text-editor">
  28 + <state relative-caret-position="244">
  29 + <caret line="46" column="25" lean-forward="false" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="25" />
  30 + <folding />
  31 + </state>
  32 + </provider>
  33 + </entry>
  34 + </file>
  35 + <file leaf-file-name="wonderful.js" pinned="false" current-in-tab="false">
  36 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
  37 + <provider selected="true" editor-type-id="text-editor">
  38 + <state relative-caret-position="325">
  39 + <caret line="31" column="130" lean-forward="false" selection-start-line="31" selection-start-column="130" selection-end-line="31" selection-end-column="130" />
  40 + <folding />
  41 + </state>
  42 + </provider>
  43 + </entry>
  44 + </file>
  45 + <file leaf-file-name="add.html" pinned="false" current-in-tab="false">
  46 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
  47 + <provider selected="true" editor-type-id="text-editor">
  48 + <state relative-caret-position="575">
  49 + <caret line="44" column="67" lean-forward="false" selection-start-line="44" selection-start-column="67" selection-end-line="44" selection-end-column="67" />
  50 + <folding />
  51 + </state>
  52 + </provider>
  53 + </entry>
  54 + </file>
  55 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  56 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
  57 + <provider selected="true" editor-type-id="text-editor">
  58 + <state relative-caret-position="472">
  59 + <caret line="44" column="84" lean-forward="false" selection-start-line="44" selection-start-column="84" selection-end-line="44" selection-end-column="84" />
  60 + <folding />
  61 + </state>
  62 + </provider>
  63 + </entry>
  64 + </file>
  65 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
17 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 66 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
18 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
19 - <state relative-caret-position="462">  
20 - <caret line="118" column="30" lean-forward="true" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="30" /> 68 + <state relative-caret-position="133">
  69 + <caret line="89" column="5" lean-forward="true" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
21 <folding> 70 <folding>
22 <element signature="e#365#484#0#PHP" expanded="false" /> 71 <element signature="e#365#484#0#PHP" expanded="false" />
23 <element signature="e#490#1228#0#PHP" expanded="false" /> 72 <element signature="e#490#1228#0#PHP" expanded="false" />
24 <element signature="e#1233#2896#0#PHP" expanded="false" /> 73 <element signature="e#1233#2896#0#PHP" expanded="false" />
25 <element signature="e#2902#3430#0#PHP" expanded="false" /> 74 <element signature="e#2902#3430#0#PHP" expanded="false" />
26 - <element signature="e#4212#4619#0#PHP" expanded="false" />  
27 - <element signature="e#4624#4967#0#PHP" expanded="false" />  
28 - <element signature="e#4973#5810#0#PHP" expanded="false" />  
29 - <element signature="e#5815#8010#0#PHP" expanded="false" />  
30 - <element signature="e#8016#8661#0#PHP" expanded="false" />  
31 - <element signature="e#8666#9762#0#PHP" expanded="false" />  
32 - <element signature="e#9768#10557#0#PHP" expanded="false" />  
33 - <element signature="e#10562#11886#0#PHP" expanded="false" />  
34 - <element signature="e#11892#12594#0#PHP" expanded="false" />  
35 - <element signature="e#12599#13799#0#PHP" expanded="false" />  
36 - <element signature="e#13805#14381#0#PHP" expanded="false" />  
37 - <element signature="e#14386#14933#0#PHP" expanded="false" />  
38 - <element signature="e#14939#15623#0#PHP" expanded="false" />  
39 - <element signature="e#15628#17724#0#PHP" expanded="false" />  
40 - <element signature="e#17730#18600#0#PHP" expanded="false" />  
41 - <element signature="e#18605#21101#0#PHP" expanded="false" />  
42 - <element signature="e#21107#21484#0#PHP" expanded="false" />  
43 - <element signature="e#21489#21810#0#PHP" expanded="false" />  
44 - <element signature="e#21816#22321#0#PHP" expanded="false" />  
45 - <element signature="e#22326#22577#0#PHP" expanded="false" />  
46 - <element signature="e#22583#23062#0#PHP" expanded="false" />  
47 - <element signature="e#23067#23824#0#PHP" expanded="false" />  
48 - <element signature="e#23830#24311#0#PHP" expanded="false" />  
49 - <element signature="e#24316#25086#0#PHP" expanded="false" />  
50 - <element signature="e#25092#25455#0#PHP" expanded="false" />  
51 - <element signature="e#25460#25651#0#PHP" expanded="false" />  
52 - <element signature="e#25657#26015#0#PHP" expanded="false" />  
53 - <element signature="e#26020#26211#0#PHP" expanded="false" />  
54 - <element signature="e#26217#27360#0#PHP" expanded="false" />  
55 - <element signature="e#27365#30030#0#PHP" expanded="false" />  
56 - <element signature="e#30036#30534#0#PHP" expanded="false" />  
57 - <element signature="e#30539#32285#0#PHP" expanded="false" />  
58 - <element signature="e#32291#32704#0#PHP" expanded="false" />  
59 - <element signature="e#32709#33188#0#PHP" expanded="false" />  
60 - <element signature="e#33194#33728#0#PHP" expanded="false" />  
61 - <element signature="e#33733#35118#0#PHP" expanded="false" />  
62 - <element signature="e#35124#35778#0#PHP" expanded="false" />  
63 - <element signature="e#35783#37798#0#PHP" expanded="false" />  
64 - <element signature="e#36821#37283#0#PHP" expanded="false" />  
65 - <element signature="e#37804#38564#0#PHP" expanded="false" />  
66 - <element signature="e#38569#41278#0#PHP" expanded="false" />  
67 - <element signature="e#41304#42135#0#PHP" expanded="false" />  
68 - <element signature="e#42141#42561#0#PHP" expanded="false" />  
69 - <element signature="e#42566#43049#0#PHP" expanded="false" />  
70 - <element signature="e#43055#43861#0#PHP" expanded="false" />  
71 - <element signature="e#43866#47020#0#PHP" expanded="false" />  
72 - <element signature="e#47035#48363#0#PHP" expanded="false" />  
73 - <element signature="e#48379#49406#0#PHP" expanded="false" />  
74 - <element signature="e#49412#50170#0#PHP" expanded="false" />  
75 - <element signature="e#50175#53918#0#PHP" expanded="false" />  
76 - <element signature="e#53924#54316#0#PHP" expanded="false" />  
77 - <element signature="e#54321#55273#0#PHP" expanded="false" />  
78 - <element signature="e#55297#55870#0#PHP" expanded="false" />  
79 - <element signature="e#55876#56475#0#PHP" expanded="false" />  
80 - <element signature="e#56480#57407#0#PHP" expanded="false" />  
81 - <element signature="e#57413#58127#0#PHP" expanded="false" />  
82 - <element signature="e#58133#58560#0#PHP" expanded="false" />  
83 - <element signature="e#58565#59034#0#PHP" expanded="false" /> 75 + <element signature="e#3435#4477#0#PHP" expanded="false" />
  76 + <element signature="e#4483#4890#0#PHP" expanded="false" />
  77 + <element signature="e#4895#5238#0#PHP" expanded="false" />
  78 + <element signature="e#5244#6081#0#PHP" expanded="false" />
  79 + <element signature="e#6086#8281#0#PHP" expanded="false" />
  80 + <element signature="e#8287#8932#0#PHP" expanded="false" />
  81 + <element signature="e#8937#10033#0#PHP" expanded="false" />
  82 + <element signature="e#10039#10828#0#PHP" expanded="false" />
  83 + <element signature="e#10833#12157#0#PHP" expanded="false" />
  84 + <element signature="e#12163#12865#0#PHP" expanded="false" />
  85 + <element signature="e#12870#14070#0#PHP" expanded="false" />
  86 + <element signature="e#14076#14652#0#PHP" expanded="false" />
  87 + <element signature="e#14657#15204#0#PHP" expanded="false" />
  88 + <element signature="e#15210#15894#0#PHP" expanded="false" />
  89 + <element signature="e#15899#17995#0#PHP" expanded="false" />
  90 + <element signature="e#18001#18871#0#PHP" expanded="false" />
  91 + <element signature="e#18876#21372#0#PHP" expanded="false" />
  92 + <element signature="e#21378#21755#0#PHP" expanded="false" />
  93 + <element signature="e#21760#22081#0#PHP" expanded="false" />
  94 + <element signature="e#22087#22592#0#PHP" expanded="false" />
  95 + <element signature="e#22597#22848#0#PHP" expanded="false" />
  96 + <element signature="e#22854#23333#0#PHP" expanded="false" />
  97 + <element signature="e#23338#24095#0#PHP" expanded="false" />
  98 + <element signature="e#24101#24582#0#PHP" expanded="false" />
  99 + <element signature="e#24587#25357#0#PHP" expanded="false" />
  100 + <element signature="e#25363#25726#0#PHP" expanded="false" />
  101 + <element signature="e#25731#25922#0#PHP" expanded="false" />
  102 + <element signature="e#25928#26286#0#PHP" expanded="false" />
  103 + <element signature="e#26291#26482#0#PHP" expanded="false" />
  104 + <element signature="e#26488#27631#0#PHP" expanded="false" />
  105 + <element signature="e#27636#30301#0#PHP" expanded="false" />
  106 + <element signature="e#30307#30805#0#PHP" expanded="false" />
  107 + <element signature="e#30810#32556#0#PHP" expanded="false" />
  108 + <element signature="e#32562#32975#0#PHP" expanded="false" />
  109 + <element signature="e#32980#33459#0#PHP" expanded="false" />
  110 + <element signature="e#33465#33999#0#PHP" expanded="false" />
  111 + <element signature="e#34004#35389#0#PHP" expanded="false" />
  112 + <element signature="e#35395#36049#0#PHP" expanded="false" />
  113 + <element signature="e#36054#38069#0#PHP" expanded="false" />
  114 + <element signature="e#37092#37554#0#PHP" expanded="false" />
  115 + <element signature="e#38075#38835#0#PHP" expanded="false" />
  116 + <element signature="e#38840#41549#0#PHP" expanded="false" />
  117 + <element signature="e#41575#42406#0#PHP" expanded="false" />
  118 + <element signature="e#42412#42832#0#PHP" expanded="false" />
  119 + <element signature="e#42837#43320#0#PHP" expanded="false" />
  120 + <element signature="e#43326#44132#0#PHP" expanded="false" />
  121 + <element signature="e#44137#47291#0#PHP" expanded="false" />
  122 + <element signature="e#47306#48634#0#PHP" expanded="false" />
  123 + <element signature="e#48650#49677#0#PHP" expanded="false" />
  124 + <element signature="e#49683#50441#0#PHP" expanded="false" />
  125 + <element signature="e#50446#54189#0#PHP" expanded="false" />
  126 + <element signature="e#54195#54587#0#PHP" expanded="false" />
  127 + <element signature="e#54592#55544#0#PHP" expanded="false" />
  128 + <element signature="e#55568#56141#0#PHP" expanded="false" />
  129 + <element signature="e#56147#56746#0#PHP" expanded="false" />
  130 + <element signature="e#56751#57678#0#PHP" expanded="false" />
  131 + <element signature="e#57684#58398#0#PHP" expanded="false" />
  132 + <element signature="e#58404#58831#0#PHP" expanded="false" />
  133 + <element signature="e#58836#59305#0#PHP" expanded="false" />
84 </folding> 134 </folding>
85 </state> 135 </state>
86 </provider> 136 </provider>
87 </entry> 137 </entry>
88 </file> 138 </file>
89 - <file leaf-file-name="verify.php" pinned="false" current-in-tab="true">  
90 - <entry file="file://$PROJECT_DIR$/application/extra/verify.php">  
91 - <provider selected="true" editor-type-id="text-editor">  
92 - <state relative-caret-position="450">  
93 - <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />  
94 - <folding />  
95 - </state>  
96 - </provider>  
97 - </entry>  
98 - </file>  
99 </leaf> 139 </leaf>
100 </component> 140 </component>
101 <component name="FindInProjectRecents"> 141 <component name="FindInProjectRecents">
@@ -116,8 +156,6 @@ @@ -116,8 +156,6 @@
116 <list> 156 <list>
117 <option value="$PROJECT_DIR$/application/admin/view/video/index.html" /> 157 <option value="$PROJECT_DIR$/application/admin/view/video/index.html" />
118 <option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" /> 158 <option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" />
119 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />  
120 - <option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />  
121 <option value="$PROJECT_DIR$/public/assets/js/backend/type.js" /> 159 <option value="$PROJECT_DIR$/public/assets/js/backend/type.js" />
122 <option value="$PROJECT_DIR$/application/admin/view/type/add.html" /> 160 <option value="$PROJECT_DIR$/application/admin/view/type/add.html" />
123 <option value="$PROJECT_DIR$/application/admin/view/type/index.html" /> 161 <option value="$PROJECT_DIR$/application/admin/view/type/index.html" />
@@ -136,8 +174,6 @@ @@ -136,8 +174,6 @@
136 <option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" /> 174 <option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
137 <option value="$PROJECT_DIR$/application/admin/view/vip/index.html" /> 175 <option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
138 <option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" /> 176 <option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" />
139 - <option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />  
140 - <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />  
141 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" /> 177 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
142 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" /> 178 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
143 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 179 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
@@ -145,11 +181,9 @@ @@ -145,11 +181,9 @@
145 <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" /> 181 <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
146 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" /> 182 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
147 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" /> 183 <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
148 - <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />  
149 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> 184 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
150 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" /> 185 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
151 <option value="$PROJECT_DIR$/application/admin/view/order/index.html" /> 186 <option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
152 - <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />  
153 <option value="$PROJECT_DIR$/application/admin/model/User.php" /> 187 <option value="$PROJECT_DIR$/application/admin/model/User.php" />
154 <option value="$PROJECT_DIR$/application/admin/model/Order.php" /> 188 <option value="$PROJECT_DIR$/application/admin/model/Order.php" />
155 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> 189 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
@@ -163,8 +197,14 @@ @@ -163,8 +197,14 @@
163 <option value="$USER_HOME$/Desktop/1.html" /> 197 <option value="$USER_HOME$/Desktop/1.html" />
164 <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> 198 <option value="$PROJECT_DIR$/application/nsms/nsms.php" />
165 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 199 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
166 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
167 <option value="$PROJECT_DIR$/application/extra/verify.php" /> 200 <option value="$PROJECT_DIR$/application/extra/verify.php" />
  201 + <option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
  202 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
  203 + <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
  204 + <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
  205 + <option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
  206 + <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
  207 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
168 </list> 208 </list>
169 </option> 209 </option>
170 </component> 210 </component>
@@ -182,11 +222,11 @@ @@ -182,11 +222,11 @@
182 <sorting>DEFINITION_ORDER</sorting> 222 <sorting>DEFINITION_ORDER</sorting>
183 </component> 223 </component>
184 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 224 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
185 - <component name="ProjectFrameBounds" extendedState="1">  
186 - <option name="x" value="195" />  
187 - <option name="y" value="60" /> 225 + <component name="ProjectFrameBounds">
  226 + <option name="x" value="608" />
  227 + <option name="y" value="63" />
188 <option name="width" value="1696" /> 228 <option name="width" value="1696" />
189 - <option name="height" value="945" /> 229 + <option name="height" value="948" />
190 </component> 230 </component>
191 <component name="ProjectView"> 231 <component name="ProjectView">
192 <navigator currentView="ProjectPane" proportions="" version="1"> 232 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -203,8 +243,8 @@ @@ -203,8 +243,8 @@
203 <foldersAlwaysOnTop value="true" /> 243 <foldersAlwaysOnTop value="true" />
204 </navigator> 244 </navigator>
205 <panes> 245 <panes>
206 - <pane id="Scratches" />  
207 <pane id="Scope" /> 246 <pane id="Scope" />
  247 + <pane id="Scratches" />
208 <pane id="ProjectPane"> 248 <pane id="ProjectPane">
209 <subPane> 249 <subPane>
210 <expand> 250 <expand>
@@ -230,12 +270,6 @@ @@ -230,12 +270,6 @@
230 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 270 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
231 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 271 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
232 </path> 272 </path>
233 - <path>  
234 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
235 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
236 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
237 - <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" />  
238 - </path>  
239 </expand> 273 </expand>
240 <select /> 274 <select />
241 </subPane> 275 </subPane>
@@ -306,7 +340,11 @@ @@ -306,7 +340,11 @@
306 <workItem from="1574904867625" duration="793000" /> 340 <workItem from="1574904867625" duration="793000" />
307 <workItem from="1574908494078" duration="8000" /> 341 <workItem from="1574908494078" duration="8000" />
308 <workItem from="1574908927190" duration="2693000" /> 342 <workItem from="1574908927190" duration="2693000" />
309 - <workItem from="1574917615987" duration="631000" /> 343 + <workItem from="1574917615987" duration="1388000" />
  344 + <workItem from="1574988912149" duration="1103000" />
  345 + <workItem from="1575337352423" duration="994000" />
  346 + <workItem from="1575340427887" duration="256000" />
  347 + <workItem from="1575420983161" duration="4929000" />
310 </task> 348 </task>
311 <task id="LOCAL-00001" summary="调试"> 349 <task id="LOCAL-00001" summary="调试">
312 <created>1574145133364</created> 350 <created>1574145133364</created>
@@ -319,7 +357,7 @@ @@ -319,7 +357,7 @@
319 <servers /> 357 <servers />
320 </component> 358 </component>
321 <component name="TimeTrackingManager"> 359 <component name="TimeTrackingManager">
322 - <option name="totallyTimeSpent" value="286451000" /> 360 + <option name="totallyTimeSpent" value="294490000" />
323 </component> 361 </component>
324 <component name="TodoView"> 362 <component name="TodoView">
325 <todo-panel id="selected-file"> 363 <todo-panel id="selected-file">
@@ -331,17 +369,17 @@ @@ -331,17 +369,17 @@
331 </todo-panel> 369 </todo-panel>
332 </component> 370 </component>
333 <component name="ToolWindowManager"> 371 <component name="ToolWindowManager">
334 - <frame x="195" y="60" width="1696" height="945" extended-state="1" /> 372 + <frame x="608" y="63" width="1696" height="948" extended-state="0" />
335 <editor active="true" /> 373 <editor active="true" />
336 <layout> 374 <layout>
337 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16687042" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 375 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17420538" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
338 <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" /> 376 <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" />
339 <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" /> 377 <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" />
340 <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" /> 378 <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" />
341 <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" /> 379 <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" />
342 <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" /> 380 <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" />
343 <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" /> 381 <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" />
344 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.103960395" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 382 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.103535354" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
345 <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" /> 383 <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" />
346 <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" /> 384 <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" />
347 <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" /> 385 <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" />
@@ -389,101 +427,6 @@ @@ -389,101 +427,6 @@
389 <watches-manager /> 427 <watches-manager />
390 </component> 428 </component>
391 <component name="editorHistoryManager"> 429 <component name="editorHistoryManager">
392 - <entry file="file://$PROJECT_DIR$/public/uploads/20191118/ceshi.jpg">  
393 - <provider selected="true" editor-type-id="images">  
394 - <state />  
395 - </provider>  
396 - </entry>  
397 - <entry file="file://$PROJECT_DIR$/public/uploads/20191118/816159a7bdf6f41ec9b48ff9e719138a.gif">  
398 - <provider selected="true" editor-type-id="images">  
399 - <state />  
400 - </provider>  
401 - </entry>  
402 - <entry file="file://$PROJECT_DIR$/public/uploads/20191118/654e4493c68c2061349696c949520d8e.jpg">  
403 - <provider selected="true" editor-type-id="images">  
404 - <state />  
405 - </provider>  
406 - </entry>  
407 - <entry file="file://$PROJECT_DIR$/public/uploads/20191118/641ab72907d3118b1ca3976e0f869f09.jpg">  
408 - <provider selected="true" editor-type-id="images">  
409 - <state />  
410 - </provider>  
411 - </entry>  
412 - <entry file="file://$PROJECT_DIR$/public/uploads/20191118/6c67e6b0911d47744cdffc3d1e422ee4.jpg">  
413 - <provider selected="true" editor-type-id="images">  
414 - <state />  
415 - </provider>  
416 - </entry>  
417 - <entry file="file://$PROJECT_DIR$/addons/qiniu/controller/Index.php">  
418 - <provider selected="true" editor-type-id="text-editor">  
419 - <state relative-caret-position="-1875">  
420 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
421 - </state>  
422 - </provider>  
423 - </entry>  
424 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">  
425 - <provider selected="true" editor-type-id="text-editor">  
426 - <state relative-caret-position="-150">  
427 - <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />  
428 - </state>  
429 - </provider>  
430 - </entry>  
431 - <entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">  
432 - <provider selected="true" editor-type-id="text-editor">  
433 - <state relative-caret-position="175">  
434 - <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />  
435 - </state>  
436 - </provider>  
437 - </entry>  
438 - <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">  
439 - <provider selected="true" editor-type-id="text-editor">  
440 - <state relative-caret-position="275">  
441 - <caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />  
442 - </state>  
443 - </provider>  
444 - </entry>  
445 - <entry file="file://$PROJECT_DIR$/application/admin/model/UserRule.php">  
446 - <provider selected="true" editor-type-id="text-editor">  
447 - <state relative-caret-position="0">  
448 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
449 - </state>  
450 - </provider>  
451 - </entry>  
452 - <entry file="file://$PROJECT_DIR$/application/admin/model/User.php">  
453 - <provider selected="true" editor-type-id="text-editor">  
454 - <state relative-caret-position="325">  
455 - <caret line="22" column="6" lean-forward="true" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />  
456 - </state>  
457 - </provider>  
458 - </entry>  
459 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">  
460 - <provider selected="true" editor-type-id="text-editor">  
461 - <state relative-caret-position="0">  
462 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
463 - </state>  
464 - </provider>  
465 - </entry>  
466 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">  
467 - <provider selected="true" editor-type-id="text-editor">  
468 - <state relative-caret-position="1030">  
469 - <caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />  
470 - </state>  
471 - </provider>  
472 - </entry>  
473 - <entry file="file://$PROJECT_DIR$/application/admin/model/Order.php">  
474 - <provider selected="true" editor-type-id="text-editor">  
475 - <state relative-caret-position="654">  
476 - <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />  
477 - </state>  
478 - </provider>  
479 - </entry>  
480 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">  
481 - <provider selected="true" editor-type-id="text-editor">  
482 - <state relative-caret-position="425">  
483 - <caret line="44" column="129" lean-forward="false" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="129" />  
484 - </state>  
485 - </provider>  
486 - </entry>  
487 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php"> 430 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
488 <provider selected="true" editor-type-id="text-editor"> 431 <provider selected="true" editor-type-id="text-editor">
489 <state relative-caret-position="494"> 432 <state relative-caret-position="494">
@@ -491,20 +434,6 @@ @@ -491,20 +434,6 @@
491 </state> 434 </state>
492 </provider> 435 </provider>
493 </entry> 436 </entry>
494 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">  
495 - <provider selected="true" editor-type-id="text-editor">  
496 - <state relative-caret-position="400">  
497 - <caret line="27" column="78" lean-forward="true" selection-start-line="27" selection-start-column="78" selection-end-line="27" selection-end-column="78" />  
498 - </state>  
499 - </provider>  
500 - </entry>  
501 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
502 - <provider selected="true" editor-type-id="text-editor">  
503 - <state relative-caret-position="234">  
504 - <caret line="27" column="75" lean-forward="true" selection-start-line="27" selection-start-column="75" selection-end-line="27" selection-end-column="75" />  
505 - </state>  
506 - </provider>  
507 - </entry>  
508 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php"> 437 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
509 <provider selected="true" editor-type-id="text-editor"> 438 <provider selected="true" editor-type-id="text-editor">
510 <state relative-caret-position="150"> 439 <state relative-caret-position="150">
@@ -612,14 +541,6 @@ @@ -612,14 +541,6 @@
612 </state> 541 </state>
613 </provider> 542 </provider>
614 </entry> 543 </entry>
615 - <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">  
616 - <provider selected="true" editor-type-id="text-editor">  
617 - <state relative-caret-position="225">  
618 - <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />  
619 - <folding />  
620 - </state>  
621 - </provider>  
622 - </entry>  
623 <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php"> 544 <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
624 <provider selected="true" editor-type-id="text-editor"> 545 <provider selected="true" editor-type-id="text-editor">
625 <state relative-caret-position="203"> 546 <state relative-caret-position="203">
@@ -708,7 +629,6 @@ @@ -708,7 +629,6 @@
708 <provider selected="true" editor-type-id="text-editor"> 629 <provider selected="true" editor-type-id="text-editor">
709 <state relative-caret-position="1644"> 630 <state relative-caret-position="1644">
710 <caret line="66" column="50" lean-forward="false" selection-start-line="66" selection-start-column="50" selection-end-line="66" selection-end-column="50" /> 631 <caret line="66" column="50" lean-forward="false" selection-start-line="66" selection-start-column="50" selection-end-line="66" selection-end-column="50" />
711 - <folding />  
712 </state> 632 </state>
713 </provider> 633 </provider>
714 </entry> 634 </entry>
@@ -717,7 +637,7 @@ @@ -717,7 +637,7 @@
717 <state relative-caret-position="381"> 637 <state relative-caret-position="381">
718 <caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" /> 638 <caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />
719 <folding> 639 <folding>
720 - <element signature="e#38#68#0#PHP" expanded="true" /> 640 + <element signature="e#38#68#0#PHP" expanded="false" />
721 <element signature="e#574#693#0#PHP" expanded="false" /> 641 <element signature="e#574#693#0#PHP" expanded="false" />
722 <element signature="e#699#1012#0#PHP" expanded="false" /> 642 <element signature="e#699#1012#0#PHP" expanded="false" />
723 <element signature="e#1017#3093#0#PHP" expanded="false" /> 643 <element signature="e#1017#3093#0#PHP" expanded="false" />
@@ -750,84 +670,228 @@ @@ -750,84 +670,228 @@
750 </state> 670 </state>
751 </provider> 671 </provider>
752 </entry> 672 </entry>
  673 + <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
  674 + <provider selected="true" editor-type-id="text-editor">
  675 + <state relative-caret-position="450">
  676 + <caret line="18" column="45" lean-forward="false" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
  677 + </state>
  678 + </provider>
  679 + </entry>
  680 + <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
  681 + <provider selected="true" editor-type-id="text-editor">
  682 + <state relative-caret-position="228">
  683 + <caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
  684 + <folding />
  685 + </state>
  686 + </provider>
  687 + </entry>
  688 + <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
  689 + <provider selected="true" editor-type-id="text-editor">
  690 + <state relative-caret-position="225">
  691 + <caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
  692 + <folding />
  693 + </state>
  694 + </provider>
  695 + </entry>
  696 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/index.html">
  697 + <provider selected="true" editor-type-id="text-editor">
  698 + <state relative-caret-position="575">
  699 + <caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
  700 + <folding />
  701 + </state>
  702 + </provider>
  703 + </entry>
  704 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
  705 + <provider selected="true" editor-type-id="text-editor">
  706 + <state relative-caret-position="244">
  707 + <caret line="46" column="25" lean-forward="false" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="25" />
  708 + <folding />
  709 + </state>
  710 + </provider>
  711 + </entry>
  712 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
  713 + <provider selected="true" editor-type-id="text-editor">
  714 + <state relative-caret-position="175">
  715 + <caret line="7" column="27" lean-forward="false" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
  716 + <folding />
  717 + </state>
  718 + </provider>
  719 + </entry>
  720 + <entry file="file://$PROJECT_DIR$/public/api.html">
  721 + <provider selected="true" editor-type-id="text-editor">
  722 + <state relative-caret-position="-2175">
  723 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  724 + <folding />
  725 + </state>
  726 + </provider>
  727 + </entry>
  728 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
  729 + <provider selected="true" editor-type-id="text-editor">
  730 + <state relative-caret-position="575">
  731 + <caret line="34" column="140" lean-forward="false" selection-start-line="34" selection-start-column="71" selection-end-line="34" selection-end-column="140" />
  732 + <folding />
  733 + </state>
  734 + </provider>
  735 + </entry>
  736 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
  737 + <provider selected="true" editor-type-id="text-editor">
  738 + <state relative-caret-position="259">
  739 + <caret line="28" column="79" lean-forward="true" selection-start-line="28" selection-start-column="79" selection-end-line="28" selection-end-column="79" />
  740 + <folding />
  741 + </state>
  742 + </provider>
  743 + </entry>
  744 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
  745 + <provider selected="true" editor-type-id="text-editor">
  746 + <state relative-caret-position="225">
  747 + <caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
  748 + <folding />
  749 + </state>
  750 + </provider>
  751 + </entry>
  752 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
  753 + <provider selected="true" editor-type-id="text-editor">
  754 + <state relative-caret-position="325">
  755 + <caret line="31" column="130" lean-forward="false" selection-start-line="31" selection-start-column="130" selection-end-line="31" selection-end-column="130" />
  756 + <folding />
  757 + </state>
  758 + </provider>
  759 + </entry>
  760 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  761 + <provider selected="true" editor-type-id="text-editor">
  762 + <state relative-caret-position="-2453">
  763 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  764 + <folding />
  765 + </state>
  766 + </provider>
  767 + </entry>
  768 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
  769 + <provider selected="true" editor-type-id="text-editor">
  770 + <state relative-caret-position="1350">
  771 + <caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
  772 + <folding />
  773 + </state>
  774 + </provider>
  775 + </entry>
  776 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
  777 + <provider selected="true" editor-type-id="text-editor">
  778 + <state relative-caret-position="-1103">
  779 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  780 + <folding />
  781 + </state>
  782 + </provider>
  783 + </entry>
  784 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
  785 + <provider selected="true" editor-type-id="text-editor">
  786 + <state relative-caret-position="0">
  787 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  788 + <folding />
  789 + </state>
  790 + </provider>
  791 + </entry>
  792 + <entry file="file://$PROJECT_DIR$/application/admin/view/category/add.html">
  793 + <provider selected="true" editor-type-id="text-editor">
  794 + <state relative-caret-position="271">
  795 + <caret line="86" column="4" lean-forward="true" selection-start-line="86" selection-start-column="4" selection-end-line="91" selection-end-column="10" />
  796 + <folding />
  797 + </state>
  798 + </provider>
  799 + </entry>
  800 + <entry file="file://$PROJECT_DIR$/application/admin/view/category/edit.html">
  801 + <provider selected="true" editor-type-id="text-editor">
  802 + <state relative-caret-position="247">
  803 + <caret line="82" column="4" lean-forward="false" selection-start-line="82" selection-start-column="4" selection-end-line="87" selection-end-column="10" />
  804 + <folding />
  805 + </state>
  806 + </provider>
  807 + </entry>
  808 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
  809 + <provider selected="true" editor-type-id="text-editor">
  810 + <state relative-caret-position="575">
  811 + <caret line="44" column="67" lean-forward="false" selection-start-line="44" selection-start-column="67" selection-end-line="44" selection-end-column="67" />
  812 + <folding />
  813 + </state>
  814 + </provider>
  815 + </entry>
  816 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
  817 + <provider selected="true" editor-type-id="text-editor">
  818 + <state relative-caret-position="472">
  819 + <caret line="44" column="84" lean-forward="false" selection-start-line="44" selection-start-column="84" selection-end-line="44" selection-end-column="84" />
  820 + <folding />
  821 + </state>
  822 + </provider>
  823 + </entry>
753 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 824 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
754 <provider selected="true" editor-type-id="text-editor"> 825 <provider selected="true" editor-type-id="text-editor">
755 - <state relative-caret-position="462">  
756 - <caret line="118" column="30" lean-forward="true" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="30" /> 826 + <state relative-caret-position="133">
  827 + <caret line="89" column="5" lean-forward="true" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
757 <folding> 828 <folding>
758 <element signature="e#365#484#0#PHP" expanded="false" /> 829 <element signature="e#365#484#0#PHP" expanded="false" />
759 <element signature="e#490#1228#0#PHP" expanded="false" /> 830 <element signature="e#490#1228#0#PHP" expanded="false" />
760 <element signature="e#1233#2896#0#PHP" expanded="false" /> 831 <element signature="e#1233#2896#0#PHP" expanded="false" />
761 <element signature="e#2902#3430#0#PHP" expanded="false" /> 832 <element signature="e#2902#3430#0#PHP" expanded="false" />
762 - <element signature="e#4212#4619#0#PHP" expanded="false" />  
763 - <element signature="e#4624#4967#0#PHP" expanded="false" />  
764 - <element signature="e#4973#5810#0#PHP" expanded="false" />  
765 - <element signature="e#5815#8010#0#PHP" expanded="false" />  
766 - <element signature="e#8016#8661#0#PHP" expanded="false" />  
767 - <element signature="e#8666#9762#0#PHP" expanded="false" />  
768 - <element signature="e#9768#10557#0#PHP" expanded="false" />  
769 - <element signature="e#10562#11886#0#PHP" expanded="false" />  
770 - <element signature="e#11892#12594#0#PHP" expanded="false" />  
771 - <element signature="e#12599#13799#0#PHP" expanded="false" />  
772 - <element signature="e#13805#14381#0#PHP" expanded="false" />  
773 - <element signature="e#14386#14933#0#PHP" expanded="false" />  
774 - <element signature="e#14939#15623#0#PHP" expanded="false" />  
775 - <element signature="e#15628#17724#0#PHP" expanded="false" />  
776 - <element signature="e#17730#18600#0#PHP" expanded="false" />  
777 - <element signature="e#18605#21101#0#PHP" expanded="false" />  
778 - <element signature="e#21107#21484#0#PHP" expanded="false" />  
779 - <element signature="e#21489#21810#0#PHP" expanded="false" />  
780 - <element signature="e#21816#22321#0#PHP" expanded="false" />  
781 - <element signature="e#22326#22577#0#PHP" expanded="false" />  
782 - <element signature="e#22583#23062#0#PHP" expanded="false" />  
783 - <element signature="e#23067#23824#0#PHP" expanded="false" />  
784 - <element signature="e#23830#24311#0#PHP" expanded="false" />  
785 - <element signature="e#24316#25086#0#PHP" expanded="false" />  
786 - <element signature="e#25092#25455#0#PHP" expanded="false" />  
787 - <element signature="e#25460#25651#0#PHP" expanded="false" />  
788 - <element signature="e#25657#26015#0#PHP" expanded="false" />  
789 - <element signature="e#26020#26211#0#PHP" expanded="false" />  
790 - <element signature="e#26217#27360#0#PHP" expanded="false" />  
791 - <element signature="e#27365#30030#0#PHP" expanded="false" />  
792 - <element signature="e#30036#30534#0#PHP" expanded="false" />  
793 - <element signature="e#30539#32285#0#PHP" expanded="false" />  
794 - <element signature="e#32291#32704#0#PHP" expanded="false" />  
795 - <element signature="e#32709#33188#0#PHP" expanded="false" />  
796 - <element signature="e#33194#33728#0#PHP" expanded="false" />  
797 - <element signature="e#33733#35118#0#PHP" expanded="false" />  
798 - <element signature="e#35124#35778#0#PHP" expanded="false" />  
799 - <element signature="e#35783#37798#0#PHP" expanded="false" />  
800 - <element signature="e#36821#37283#0#PHP" expanded="false" />  
801 - <element signature="e#37804#38564#0#PHP" expanded="false" />  
802 - <element signature="e#38569#41278#0#PHP" expanded="false" />  
803 - <element signature="e#41304#42135#0#PHP" expanded="false" />  
804 - <element signature="e#42141#42561#0#PHP" expanded="false" />  
805 - <element signature="e#42566#43049#0#PHP" expanded="false" />  
806 - <element signature="e#43055#43861#0#PHP" expanded="false" />  
807 - <element signature="e#43866#47020#0#PHP" expanded="false" />  
808 - <element signature="e#47035#48363#0#PHP" expanded="false" />  
809 - <element signature="e#48379#49406#0#PHP" expanded="false" />  
810 - <element signature="e#49412#50170#0#PHP" expanded="false" />  
811 - <element signature="e#50175#53918#0#PHP" expanded="false" />  
812 - <element signature="e#53924#54316#0#PHP" expanded="false" />  
813 - <element signature="e#54321#55273#0#PHP" expanded="false" />  
814 - <element signature="e#55297#55870#0#PHP" expanded="false" />  
815 - <element signature="e#55876#56475#0#PHP" expanded="false" />  
816 - <element signature="e#56480#57407#0#PHP" expanded="false" />  
817 - <element signature="e#57413#58127#0#PHP" expanded="false" />  
818 - <element signature="e#58133#58560#0#PHP" expanded="false" />  
819 - <element signature="e#58565#59034#0#PHP" expanded="false" /> 833 + <element signature="e#3435#4477#0#PHP" expanded="false" />
  834 + <element signature="e#4483#4890#0#PHP" expanded="false" />
  835 + <element signature="e#4895#5238#0#PHP" expanded="false" />
  836 + <element signature="e#5244#6081#0#PHP" expanded="false" />
  837 + <element signature="e#6086#8281#0#PHP" expanded="false" />
  838 + <element signature="e#8287#8932#0#PHP" expanded="false" />
  839 + <element signature="e#8937#10033#0#PHP" expanded="false" />
  840 + <element signature="e#10039#10828#0#PHP" expanded="false" />
  841 + <element signature="e#10833#12157#0#PHP" expanded="false" />
  842 + <element signature="e#12163#12865#0#PHP" expanded="false" />
  843 + <element signature="e#12870#14070#0#PHP" expanded="false" />
  844 + <element signature="e#14076#14652#0#PHP" expanded="false" />
  845 + <element signature="e#14657#15204#0#PHP" expanded="false" />
  846 + <element signature="e#15210#15894#0#PHP" expanded="false" />
  847 + <element signature="e#15899#17995#0#PHP" expanded="false" />
  848 + <element signature="e#18001#18871#0#PHP" expanded="false" />
  849 + <element signature="e#18876#21372#0#PHP" expanded="false" />
  850 + <element signature="e#21378#21755#0#PHP" expanded="false" />
  851 + <element signature="e#21760#22081#0#PHP" expanded="false" />
  852 + <element signature="e#22087#22592#0#PHP" expanded="false" />
  853 + <element signature="e#22597#22848#0#PHP" expanded="false" />
  854 + <element signature="e#22854#23333#0#PHP" expanded="false" />
  855 + <element signature="e#23338#24095#0#PHP" expanded="false" />
  856 + <element signature="e#24101#24582#0#PHP" expanded="false" />
  857 + <element signature="e#24587#25357#0#PHP" expanded="false" />
  858 + <element signature="e#25363#25726#0#PHP" expanded="false" />
  859 + <element signature="e#25731#25922#0#PHP" expanded="false" />
  860 + <element signature="e#25928#26286#0#PHP" expanded="false" />
  861 + <element signature="e#26291#26482#0#PHP" expanded="false" />
  862 + <element signature="e#26488#27631#0#PHP" expanded="false" />
  863 + <element signature="e#27636#30301#0#PHP" expanded="false" />
  864 + <element signature="e#30307#30805#0#PHP" expanded="false" />
  865 + <element signature="e#30810#32556#0#PHP" expanded="false" />
  866 + <element signature="e#32562#32975#0#PHP" expanded="false" />
  867 + <element signature="e#32980#33459#0#PHP" expanded="false" />
  868 + <element signature="e#33465#33999#0#PHP" expanded="false" />
  869 + <element signature="e#34004#35389#0#PHP" expanded="false" />
  870 + <element signature="e#35395#36049#0#PHP" expanded="false" />
  871 + <element signature="e#36054#38069#0#PHP" expanded="false" />
  872 + <element signature="e#37092#37554#0#PHP" expanded="false" />
  873 + <element signature="e#38075#38835#0#PHP" expanded="false" />
  874 + <element signature="e#38840#41549#0#PHP" expanded="false" />
  875 + <element signature="e#41575#42406#0#PHP" expanded="false" />
  876 + <element signature="e#42412#42832#0#PHP" expanded="false" />
  877 + <element signature="e#42837#43320#0#PHP" expanded="false" />
  878 + <element signature="e#43326#44132#0#PHP" expanded="false" />
  879 + <element signature="e#44137#47291#0#PHP" expanded="false" />
  880 + <element signature="e#47306#48634#0#PHP" expanded="false" />
  881 + <element signature="e#48650#49677#0#PHP" expanded="false" />
  882 + <element signature="e#49683#50441#0#PHP" expanded="false" />
  883 + <element signature="e#50446#54189#0#PHP" expanded="false" />
  884 + <element signature="e#54195#54587#0#PHP" expanded="false" />
  885 + <element signature="e#54592#55544#0#PHP" expanded="false" />
  886 + <element signature="e#55568#56141#0#PHP" expanded="false" />
  887 + <element signature="e#56147#56746#0#PHP" expanded="false" />
  888 + <element signature="e#56751#57678#0#PHP" expanded="false" />
  889 + <element signature="e#57684#58398#0#PHP" expanded="false" />
  890 + <element signature="e#58404#58831#0#PHP" expanded="false" />
  891 + <element signature="e#58836#59305#0#PHP" expanded="false" />
820 </folding> 892 </folding>
821 </state> 893 </state>
822 </provider> 894 </provider>
823 </entry> 895 </entry>
824 - <entry file="file://$PROJECT_DIR$/application/extra/verify.php">  
825 - <provider selected="true" editor-type-id="text-editor">  
826 - <state relative-caret-position="450">  
827 - <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />  
828 - <folding />  
829 - </state>  
830 - </provider>  
831 - </entry>  
832 </component> 896 </component>
833 </project> 897 </project>
@@ -32,5 +32,36 @@ class Wonderful extends Backend @@ -32,5 +32,36 @@ class Wonderful extends Backend
32 * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 32 * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
33 */ 33 */
34 34
  35 + /**
  36 + * 查看
  37 + */
  38 + public function index()
  39 + {
  40 + //设置过滤方法
  41 + $this->request->filter(['strip_tags']);
  42 + if ($this->request->isAjax()) {
  43 + //如果发送的来源是Selectpage，则转发到Selectpage
  44 + if ($this->request->request('keyField')) {
  45 + return $this->selectpage();
  46 + }
  47 + list($where, $sort, $order, $offset, $limit) = $this->buildparams();
  48 + $total = $this->model
  49 + ->where($where)
  50 + ->order($sort, $order)
  51 + ->count();
  52 +
  53 + $list = $this->model
  54 + ->where($where)
  55 + ->order($sort, $order)
  56 + ->limit($offset, $limit)
  57 + ->select();
  58 +
  59 + $list = collection($list)->toArray();
  60 + $result = array("total" => $total, "rows" => $list);
  61 +
  62 + return json($result);
  63 + }
  64 + return $this->view->fetch();
  65 + }
35 66
36 } 67 }
@@ -4,7 +4,8 @@ return [ @@ -4,7 +4,8 @@ return [
4 'Title' => '视频标题', 4 'Title' => '视频标题',
5 'Thumbnail' => '视频封面', 5 'Thumbnail' => '视频封面',
6 'Video' => '视频', 6 'Video' => '视频',
7 - 'Is_show' => '是否在首页显示', 7 + 'Is_show' => '首页展示权重',
  8 + 'Is_top' => '是否置顶',
8 'Createtime' => '创建时间', 9 'Createtime' => '创建时间',
9 'Updatetime' => '修改时间' 10 'Updatetime' => '修改时间'
10 ]; 11 ];
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">{:__('Is_show')}:</label>
  4 + <div class="col-xs-12 col-sm-8">
  5 + <input id="c-is_show" data-rule="required" class="form-control" name="row[is_show]" 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">{:__('Title')}:</label> 9 <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
5 <div class="col-xs-12 col-sm-8"> 10 <div class="col-xs-12 col-sm-8">
@@ -34,6 +39,12 @@ @@ -34,6 +39,12 @@
34 <ul class="row list-inline plupload-preview" id="p-avatar"></ul> 39 <ul class="row list-inline plupload-preview" id="p-avatar"></ul>
35 </div> 40 </div>
36 </div> 41 </div>
  42 + <div class="form-group">
  43 + <label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label>
  44 + <div class="col-xs-12 col-sm-8">
  45 + {:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')])}
  46 + </div>
  47 + </div>
37 <div class="form-group layer-footer"> 48 <div class="form-group layer-footer">
38 <label class="control-label col-xs-12 col-sm-2"></label> 49 <label class="control-label col-xs-12 col-sm-2"></label>
39 <div class="col-xs-12 col-sm-8"> 50 <div class="col-xs-12 col-sm-8">
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">{:__('Is_show')}:</label>
  4 + <div class="col-xs-12 col-sm-8">
  5 + <input id="c-is_show" data-rule="required" class="form-control" name="row[is_show]" type="text" value="{$row.is_show|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">{:__('Title')}:</label> 9 <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
5 <div class="col-xs-12 col-sm-8"> 10 <div class="col-xs-12 col-sm-8">
@@ -34,6 +39,12 @@ @@ -34,6 +39,12 @@
34 <ul class="row list-inline plupload-preview" id="p-avatar"></ul> 39 <ul class="row list-inline plupload-preview" id="p-avatar"></ul>
35 </div> 40 </div>
36 </div> 41 </div>
  42 + <div class="form-group">
  43 + <label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label>
  44 + <div class="col-xs-12 col-sm-8">
  45 + {:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')], $row['is_top'])}
  46 + </div>
  47 + </div>
37 <div class="form-group layer-footer"> 48 <div class="form-group layer-footer">
38 <label class="control-label col-xs-12 col-sm-2"></label> 49 <label class="control-label col-xs-12 col-sm-2"></label>
39 <div class="col-xs-12 col-sm-8"> 50 <div class="col-xs-12 col-sm-8">
@@ -121,9 +121,15 @@ class User extends Api @@ -121,9 +121,15 @@ class User extends Api
121 ->find(); 121 ->find();
122 $wonderful = Db::name('wonderful') 122 $wonderful = Db::name('wonderful')
123 ->field('id,thumbnail') 123 ->field('id,thumbnail')
124 - ->order('id desc') 124 + ->where('is_top',1)
  125 + ->order('createtime desc,id desc')
125 ->limit('1') 126 ->limit('1')
126 - ->find(); 127 + ->select();
  128 +// $res['wonderful_thumbnail'] = [];
  129 +// foreach ($wonderful as &$v){
  130 +// $v['thumbnail'] = $rule.$v['thumbnail'];
  131 +// array_push($res['wonderful_thumbnail'],$v['thumbnail']);
  132 +// }
127 $this->auth; 133 $this->auth;
128 $res['video_thumbnail'] = $rule.$data['thumbnail']; 134 $res['video_thumbnail'] = $rule.$data['thumbnail'];
129 $res['pic_thumbnail'] = $rule.$pic['thumbnail']; 135 $res['pic_thumbnail'] = $rule.$pic['thumbnail'];
1 <?php 1 <?php
2 2
3 return array ( 3 return array (
4 - 'name' => '航拍视频', 4 + 'name' => '仁甲看见SHOP',
5 'beian' => '', 5 'beian' => '',
6 'cdnurl' => '', 6 'cdnurl' => '',
7 'version' => '1.0.1', 7 'version' => '1.0.1',
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 6 <meta name="viewport" content="width=device-width, initial-scale=1.0">
7 <meta name="description" content=""> 7 <meta name="description" content="">
8 - <meta name="author" content="航拍视频">  
9 - <title>航拍视频</title> 8 + <meta name="author" content="仁甲看见SHOP">
  9 + <title>仁甲看见SHOP</title>
10 10
11 <!-- Bootstrap Core CSS --> 11 <!-- Bootstrap Core CSS -->
12 <link href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> 12 <link href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 <span class="icon-bar"></span> 109 <span class="icon-bar"></span>
110 <span class="icon-bar"></span> 110 <span class="icon-bar"></span>
111 </button> 111 </button>
112 - <a class="navbar-brand" href="https://www.fastadmin.net" target="_blank">航拍视频</a> 112 + <a class="navbar-brand" href="https://www.fastadmin.net" target="_blank">仁甲看见SHOP</a>
113 </div> 113 </div>
114 <div class="navbar-collapse collapse"> 114 <div class="navbar-collapse collapse">
115 <form class="navbar-form navbar-right"> 115 <form class="navbar-form navbar-right">
@@ -6482,7 +6482,7 @@ @@ -6482,7 +6482,7 @@
6482 6482
6483 <div class="row mt0 footer"> 6483 <div class="row mt0 footer">
6484 <div class="col-md-6" align="left"> 6484 <div class="col-md-6" align="left">
6485 - Generated on 2019-11-28 13:17:09 </div> 6485 + Generated on 2019-12-03 09:58:30 </div>
6486 <div class="col-md-6" align="right"> 6486 <div class="col-md-6" align="right">
6487 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 6487 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
6488 </div> 6488 </div>
@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
28 {field: 'title', title: __('Title'),operate:false}, 28 {field: 'title', title: __('Title'),operate:false},
29 {field: 'keyword', title: __('Keyword'),operate:false}, 29 {field: 'keyword', title: __('Keyword'),operate:false},
30 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 30 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
31 - {field: 'type_ids', title: __('Type_ids')}, 31 + {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('video/type')},
32 {field: 'water_url', title: __('Water_url'),operate:false, formatter: Table.api.formatter.url}, 32 {field: 'water_url', title: __('Water_url'),operate:false, formatter: Table.api.formatter.url},
33 {field: 'two_url', title: __('Two_url'),operate:false, formatter: Table.api.formatter.url}, 33 {field: 'two_url', title: __('Two_url'),operate:false, formatter: Table.api.formatter.url},
34 {field: 'two_code', title: __('Two_code'),operate:false}, 34 {field: 'two_code', title: __('Two_code'),operate:false},
@@ -20,13 +20,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -20,13 +20,16 @@ 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: 'is_show',
  24 + sortOrder:'desc',
24 columns: [ 25 columns: [
25 [ 26 [
26 {checkbox: true}, 27 {checkbox: true},
27 {field: 'id', title: __('Id'),operate:false}, 28 {field: 'id', title: __('Id'),operate:false},
  29 + {field: 'is_show', title: __('Is_show'),operate:false},
28 {field: 'title', title: __('Title'),operate:false}, 30 {field: 'title', title: __('Title'),operate:false},
29 {field: 'thumbnail', title: __('Thumbnail'),operate:false,formatter: Table.api.formatter.image}, 31 {field: 'thumbnail', title: __('Thumbnail'),operate:false,formatter: Table.api.formatter.image},
  32 + {field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
30 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 33 {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}, 34 {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} 35 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}