郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 2430c545b514df0590376eba7fea5e7e55fa8564 1 个父辈 fd83fd7c
1 个管道 的构建 通过 耗费 11 秒

完成在详情页搜索功能

内嵌 并排对比
正在显示 4 个修改的文件 包含 323 行增加 和 332 行删除
@@ -5,8 +5,9 @@ @@ -5,8 +5,9 @@
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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" /> 8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
10 </list> 11 </list>
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -17,206 +18,90 @@ @@ -17,206 +18,90 @@
17 </component> 18 </component>
18 <component name="FileEditorManager"> 19 <component name="FileEditorManager">
19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 - <file leaf-file-name="Order.php" pinned="false" current-in-tab="true">  
21 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 21 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
  22 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
22 <provider selected="true" editor-type-id="text-editor"> 23 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="505">  
24 - <caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" /> 24 + <state relative-caret-position="315">
  25 + <caret line="796" column="5" lean-forward="true" selection-start-line="796" selection-start-column="5" selection-end-line="796" selection-end-column="5" />
25 <folding> 26 <folding>
26 - <element signature="e#631#922#0#PHP" expanded="false" />  
27 - <element signature="e#928#2350#0#PHP" expanded="false" />  
28 - <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />  
29 - <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />  
30 - <marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />  
31 - <marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />  
32 - <marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />  
33 - <marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />  
34 - <marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />  
35 - <marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />  
36 - <marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />  
37 - <marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />  
38 - <marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />  
39 - <marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />  
40 - <marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />  
41 - <marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />  
42 - <marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />  
43 - <marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />  
44 - <marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />  
45 - <marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />  
46 - <marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />  
47 - <marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />  
48 - <marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />  
49 - <marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />  
50 - <marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />  
51 - <marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />  
52 - <marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />  
53 - <marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />  
54 - <marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />  
55 - <marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />  
56 - <marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />  
57 - <marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />  
58 - <marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />  
59 - <marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />  
60 - <marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />  
61 - <marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />  
62 - <marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />  
63 - <marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />  
64 - <marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />  
65 - <marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />  
66 - <marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />  
67 - <marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />  
68 - <marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />  
69 - <marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />  
70 - <marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />  
71 - <marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />  
72 - <marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />  
73 - <marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />  
74 - <marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />  
75 - <marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />  
76 - <marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />  
77 - <marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />  
78 - <marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />  
79 - <marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />  
80 - <marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />  
81 - <marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />  
82 - <marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />  
83 - <marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />  
84 - <marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />  
85 - <marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />  
86 - <marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />  
87 - <marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />  
88 - <marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />  
89 - <marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />  
90 - <marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />  
91 - <marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />  
92 - <marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />  
93 - <marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />  
94 - <marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />  
95 - <marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />  
96 - <marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />  
97 - <marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />  
98 - <marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />  
99 - <marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />  
100 - <marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />  
101 - <marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />  
102 - <marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />  
103 - <marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />  
104 - <marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />  
105 - <marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />  
106 - <marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />  
107 - <marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />  
108 - <marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />  
109 - <marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />  
110 - <marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />  
111 - <marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />  
112 - <marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />  
113 - <marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />  
114 - <marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />  
115 - <marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />  
116 - <marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />  
117 - <marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />  
118 - <marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />  
119 - <marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />  
120 - <marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />  
121 - <marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />  
122 - <marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />  
123 - <marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />  
124 - <marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />  
125 - <marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />  
126 - <marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />  
127 - <marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />  
128 - <marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />  
129 - <marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />  
130 - <marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />  
131 - <marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />  
132 - <marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />  
133 - <marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />  
134 - <marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />  
135 - <marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />  
136 - <marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />  
137 - <marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />  
138 - <marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />  
139 - <marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />  
140 - <marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />  
141 - <marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />  
142 - <marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />  
143 - <marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />  
144 - <marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />  
145 - <marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />  
146 - <marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />  
147 - <marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />  
148 - <marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />  
149 - <marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />  
150 - <marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />  
151 - <marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />  
152 - <marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />  
153 - <marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />  
154 - <marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />  
155 - <marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />  
156 - <marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />  
157 - <marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />  
158 - <marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />  
159 - <marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />  
160 - <marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />  
161 - <marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />  
162 - <marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />  
163 - <marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />  
164 - <marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />  
165 - <marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />  
166 - <marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />  
167 - <marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />  
168 - <marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />  
169 - <marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />  
170 - <marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />  
171 - <marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />  
172 - <marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />  
173 - <marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />  
174 - <marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />  
175 - <marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />  
176 - <marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />  
177 - <marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />  
178 - <marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />  
179 - <marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />  
180 - <marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />  
181 - <marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />  
182 - <marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />  
183 - <marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />  
184 - <marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />  
185 - <marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />  
186 - <marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />  
187 - <marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />  
188 - <marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />  
189 - <marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />  
190 - <marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />  
191 - <marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />  
192 - <marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />  
193 - <marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />  
194 - <marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />  
195 - <marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />  
196 - <marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />  
197 - <marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />  
198 - <marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />  
199 - <marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />  
200 - <marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />  
201 - <marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />  
202 - <marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />  
203 - <marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />  
204 - <marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />  
205 - <marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />  
206 - <marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />  
207 - <marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />  
208 - <marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />  
209 - <marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />  
210 - <marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />  
211 - <marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />  
212 - <marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />  
213 - <marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />  
214 - <marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />  
215 - <marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />  
216 - <marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />  
217 - <marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />  
218 - <marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />  
219 - <marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." /> 27 + <element signature="e#544#1282#0#PHP" expanded="false" />
  28 + <element signature="e#1287#2950#0#PHP" expanded="false" />
  29 + <element signature="e#2956#3318#0#PHP" expanded="false" />
  30 + <element signature="e#3323#3613#0#PHP" expanded="false" />
  31 + <element signature="e#3619#3941#0#PHP" expanded="false" />
  32 + <element signature="e#3946#4233#0#PHP" expanded="false" />
  33 + <element signature="e#4240#4674#0#PHP" expanded="false" />
  34 + <element signature="e#4679#5037#0#PHP" expanded="false" />
  35 + <element signature="e#5043#5450#0#PHP" expanded="false" />
  36 + <element signature="e#5455#5798#0#PHP" expanded="false" />
  37 + <element signature="e#5804#6217#0#PHP" expanded="false" />
  38 + <element signature="e#6222#6539#0#PHP" expanded="false" />
  39 + <element signature="e#6545#7633#0#PHP" expanded="false" />
  40 + <element signature="e#7638#8356#0#PHP" expanded="false" />
  41 + <element signature="e#8362#9042#0#PHP" expanded="false" />
  42 + <element signature="e#9047#9960#0#PHP" expanded="false" />
  43 + <element signature="e#9966#10755#0#PHP" expanded="false" />
  44 + <element signature="e#10760#12109#0#PHP" expanded="false" />
  45 + <element signature="e#12115#12817#0#PHP" expanded="false" />
  46 + <element signature="e#12822#14142#0#PHP" expanded="false" />
  47 + <element signature="e#14148#14724#0#PHP" expanded="false" />
  48 + <element signature="e#14729#15341#0#PHP" expanded="false" />
  49 + <element signature="e#15347#16063#0#PHP" expanded="false" />
  50 + <element signature="e#16068#18608#0#PHP" expanded="false" />
  51 + <element signature="e#18614#19544#0#PHP" expanded="false" />
  52 + <element signature="e#19549#23599#0#PHP" expanded="false" />
  53 + <element signature="e#19777#23593#0#PHP" expanded="false" />
  54 + <element signature="e#23605#23982#0#PHP" expanded="false" />
  55 + <element signature="e#23987#24429#0#PHP" expanded="false" />
  56 + <element signature="e#24435#24985#0#PHP" expanded="false" />
  57 + <element signature="e#24990#26504#0#PHP" expanded="false" />
  58 + <element signature="e#26507#26516#0#PHP" expanded="false" />
  59 + <element signature="e#27276#27781#0#PHP" expanded="false" />
  60 + <element signature="e#27786#28037#0#PHP" expanded="false" />
  61 + <element signature="e#28043#28522#0#PHP" expanded="false" />
  62 + <element signature="e#28527#29284#0#PHP" expanded="false" />
  63 + <element signature="e#29290#29771#0#PHP" expanded="false" />
  64 + <element signature="e#29776#30546#0#PHP" expanded="false" />
  65 + <element signature="e#30552#30915#0#PHP" expanded="false" />
  66 + <element signature="e#30920#31111#0#PHP" expanded="false" />
  67 + <element signature="e#31117#31475#0#PHP" expanded="false" />
  68 + <element signature="e#31480#31671#0#PHP" expanded="false" />
  69 + <element signature="e#31677#32820#0#PHP" expanded="false" />
  70 + <element signature="e#32825#35490#0#PHP" expanded="false" />
  71 + <element signature="e#35496#35994#0#PHP" expanded="false" />
  72 + <element signature="e#35999#37745#0#PHP" expanded="false" />
  73 + <element signature="e#37751#38164#0#PHP" expanded="false" />
  74 + <element signature="e#38169#38648#0#PHP" expanded="false" />
  75 + <element signature="e#38654#39188#0#PHP" expanded="false" />
  76 + <element signature="e#39193#40578#0#PHP" expanded="false" />
  77 + <element signature="e#40584#41238#0#PHP" expanded="false" />
  78 + <element signature="e#41243#43258#0#PHP" expanded="false" />
  79 + <element signature="e#43264#44024#0#PHP" expanded="false" />
  80 + <element signature="e#44029#46738#0#PHP" expanded="false" />
  81 + <element signature="e#46764#47595#0#PHP" expanded="false" />
  82 + <element signature="e#47601#48021#0#PHP" expanded="false" />
  83 + <element signature="e#48026#48509#0#PHP" expanded="false" />
  84 + <element signature="e#48515#49321#0#PHP" expanded="false" />
  85 + <element signature="e#49326#52484#0#PHP" expanded="false" />
  86 + <element signature="e#49705#52478#0#PHP" expanded="false" />
  87 + <element signature="e#52499#53834#0#PHP" expanded="false" />
  88 + <element signature="e#53850#54884#0#PHP" expanded="false" />
  89 + <element signature="e#54890#55648#0#PHP" expanded="false" />
  90 + <element signature="e#55653#59396#0#PHP" expanded="false" />
  91 + <element signature="e#59402#59794#0#PHP" expanded="false" />
  92 + <element signature="e#59799#60751#0#PHP" expanded="false" />
  93 + <element signature="e#60775#61348#0#PHP" expanded="false" />
  94 + <element signature="e#61354#61953#0#PHP" expanded="false" />
  95 + <element signature="e#61958#62885#0#PHP" expanded="false" />
  96 + <element signature="e#62891#63605#0#PHP" expanded="false" />
  97 + <element signature="e#63611#64038#0#PHP" expanded="false" />
  98 + <element signature="e#64043#64512#0#PHP" expanded="false" />
  99 + <element signature="e#64519#65724#0#PHP" expanded="false" />
  100 + <element signature="e#65729#67432#0#PHP" expanded="false" />
  101 + <element signature="e#67438#68215#0#PHP" expanded="false" />
  102 + <element signature="e#68220#72158#0#PHP" expanded="false" />
  103 + <element signature="e#72164#72673#0#PHP" expanded="false" />
  104 + <element signature="e#72678#73350#0#PHP" expanded="false" />
220 </folding> 105 </folding>
221 </state> 106 </state>
222 </provider> 107 </provider>
@@ -243,6 +128,7 @@ @@ -243,6 +128,7 @@
243 <find>f</find> 128 <find>f</find>
244 <find>history</find> 129 <find>history</find>
245 <find>bootstrap-table-jumpto</find> 130 <find>bootstrap-table-jumpto</find>
  131 + <find>words</find>
246 </findStrings> 132 </findStrings>
247 <dirStrings> 133 <dirStrings>
248 <dir>D:\htdocs\areial</dir> 134 <dir>D:\htdocs\areial</dir>
@@ -300,11 +186,11 @@ @@ -300,11 +186,11 @@
300 <option value="$PROJECT_DIR$/application/admin/view/share/edit.html" /> 186 <option value="$PROJECT_DIR$/application/admin/view/share/edit.html" />
301 <option value="$PROJECT_DIR$/application/admin/view/share/index.html" /> 187 <option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
302 <option value="$PROJECT_DIR$/public/assets/js/backend/share.js" /> 188 <option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
303 - <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />  
304 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 189 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
305 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" /> 190 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
306 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
307 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> 191 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
  192 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
  193 + <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
308 </list> 194 </list>
309 </option> 195 </option>
310 </component> 196 </component>
@@ -323,10 +209,10 @@ @@ -323,10 +209,10 @@
323 </component> 209 </component>
324 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 210 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
325 <component name="ProjectFrameBounds" extendedState="1"> 211 <component name="ProjectFrameBounds" extendedState="1">
326 - <option name="x" value="357" />  
327 - <option name="y" value="51" /> 212 + <option name="x" value="300" />
  213 + <option name="y" value="85" />
328 <option name="width" value="1513" /> 214 <option name="width" value="1513" />
329 - <option name="height" value="976" /> 215 + <option name="height" value="970" />
330 </component> 216 </component>
331 <component name="ProjectView"> 217 <component name="ProjectView">
332 <navigator currentView="ProjectPane" proportions="" version="1"> 218 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -343,6 +229,8 @@ @@ -343,6 +229,8 @@
343 <foldersAlwaysOnTop value="true" /> 229 <foldersAlwaysOnTop value="true" />
344 </navigator> 230 </navigator>
345 <panes> 231 <panes>
  232 + <pane id="Scratches" />
  233 + <pane id="Scope" />
346 <pane id="ProjectPane"> 234 <pane id="ProjectPane">
347 <subPane> 235 <subPane>
348 <expand> 236 <expand>
@@ -371,20 +259,22 @@ @@ -371,20 +259,22 @@
371 <path> 259 <path>
372 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 260 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
373 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 261 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
374 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 262 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  263 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  264 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
375 </path> 265 </path>
376 <path> 266 <path>
377 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 267 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
378 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 268 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
379 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
380 - <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" /> 269 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  270 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  271 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  272 + <item name="video" type="2a2b976b:PhpTreeStructureProvider$1" />
381 </path> 273 </path>
382 </expand> 274 </expand>
383 <select /> 275 <select />
384 </subPane> 276 </subPane>
385 </pane> 277 </pane>
386 - <pane id="Scope" />  
387 - <pane id="Scratches" />  
388 </panes> 278 </panes>
389 </component> 279 </component>
390 <component name="PropertiesComponent"> 280 <component name="PropertiesComponent">
@@ -520,6 +410,7 @@ @@ -520,6 +410,7 @@
520 <workItem from="1583481861278" duration="4890000" /> 410 <workItem from="1583481861278" duration="4890000" />
521 <workItem from="1583540220249" duration="10194000" /> 411 <workItem from="1583540220249" duration="10194000" />
522 <workItem from="1583551237397" duration="11815000" /> 412 <workItem from="1583551237397" duration="11815000" />
  413 + <workItem from="1583714063562" duration="15711000" />
523 </task> 414 </task>
524 <task id="LOCAL-00001" summary="调试"> 415 <task id="LOCAL-00001" summary="调试">
525 <created>1574145133364</created> 416 <created>1574145133364</created>
@@ -546,7 +437,7 @@ @@ -546,7 +437,7 @@
546 <servers /> 437 <servers />
547 </component> 438 </component>
548 <component name="TimeTrackingManager"> 439 <component name="TimeTrackingManager">
549 - <option name="totallyTimeSpent" value="532679000" /> 440 + <option name="totallyTimeSpent" value="548390000" />
550 </component> 441 </component>
551 <component name="TodoView"> 442 <component name="TodoView">
552 <todo-panel id="selected-file"> 443 <todo-panel id="selected-file">
@@ -558,17 +449,17 @@ @@ -558,17 +449,17 @@
558 </todo-panel> 449 </todo-panel>
559 </component> 450 </component>
560 <component name="ToolWindowManager"> 451 <component name="ToolWindowManager">
561 - <frame x="357" y="51" width="1513" height="976" extended-state="1" /> 452 + <frame x="300" y="85" width="1513" height="970" extended-state="1" />
562 <editor active="true" /> 453 <editor active="true" />
563 <layout> 454 <layout>
564 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16999312" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 455 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17687543" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
565 <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" /> 456 <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" />
566 <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.329602" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> 457 <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.329602" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
567 <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" /> 458 <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" />
568 <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" /> 459 <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" />
569 <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" /> 460 <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" />
570 <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" /> 461 <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" />
571 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47087377" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 462 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47079858" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
572 <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" /> 463 <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" />
573 <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" /> 464 <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" />
574 <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" /> 465 <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" />
@@ -930,129 +821,18 @@ @@ -930,129 +821,18 @@
930 <provider selected="true" editor-type-id="text-editor"> 821 <provider selected="true" editor-type-id="text-editor">
931 <state relative-caret-position="775"> 822 <state relative-caret-position="775">
932 <caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" /> 823 <caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />
933 - <folding />  
934 - </state>  
935 - </provider>  
936 - </entry>  
937 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">  
938 - <provider selected="true" editor-type-id="text-editor">  
939 - <state relative-caret-position="368">  
940 - <caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />  
941 - <folding />  
942 - </state>  
943 - </provider>  
944 - </entry>  
945 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">  
946 - <provider selected="true" editor-type-id="text-editor">  
947 - <state relative-caret-position="300">  
948 - <caret line="94" column="10" lean-forward="false" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />  
949 - <folding />  
950 - </state>  
951 - </provider>  
952 - </entry>  
953 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">  
954 - <provider selected="true" editor-type-id="text-editor">  
955 - <state relative-caret-position="363">  
956 - <caret line="184" column="12" lean-forward="false" selection-start-line="184" selection-start-column="12" selection-end-line="184" selection-end-column="12" />  
957 - <folding>  
958 - <element signature="e#700#2169#0#PHP" expanded="false" />  
959 - <element signature="e#2201#5830#0#PHP" expanded="false" />  
960 - <element signature="e#9580#9824#0#PHP" expanded="false" />  
961 - </folding>  
962 - </state>  
963 - </provider>  
964 - </entry>  
965 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">  
966 - <provider selected="true" editor-type-id="text-editor">  
967 - <state relative-caret-position="57">  
968 - <caret line="1379" column="7" lean-forward="false" selection-start-line="1379" selection-start-column="7" selection-end-line="1379" selection-end-column="7" />  
969 - <folding>  
970 - <element signature="e#544#1282#0#PHP" expanded="false" />  
971 - <element signature="e#1287#2950#0#PHP" expanded="false" />  
972 - <element signature="e#2956#3318#0#PHP" expanded="false" />  
973 - <element signature="e#3323#3613#0#PHP" expanded="false" />  
974 - <element signature="e#3619#3941#0#PHP" expanded="false" />  
975 - <element signature="e#3946#4233#0#PHP" expanded="false" />  
976 - <element signature="e#4240#4674#0#PHP" expanded="false" />  
977 - <element signature="e#4679#5037#0#PHP" expanded="false" />  
978 - <element signature="e#5043#5450#0#PHP" expanded="false" />  
979 - <element signature="e#5455#5798#0#PHP" expanded="false" />  
980 - <element signature="e#5804#6217#0#PHP" expanded="false" />  
981 - <element signature="e#6222#6539#0#PHP" expanded="false" />  
982 - <element signature="e#6545#7633#0#PHP" expanded="false" />  
983 - <element signature="e#7638#8356#0#PHP" expanded="false" />  
984 - <element signature="e#8362#9042#0#PHP" expanded="false" />  
985 - <element signature="e#9047#9960#0#PHP" expanded="false" />  
986 - <element signature="e#9966#10755#0#PHP" expanded="false" />  
987 - <element signature="e#10760#12109#0#PHP" expanded="false" />  
988 - <element signature="e#12115#12817#0#PHP" expanded="false" />  
989 - <element signature="e#12822#14142#0#PHP" expanded="false" />  
990 - <element signature="e#14148#14724#0#PHP" expanded="false" />  
991 - <element signature="e#14729#15341#0#PHP" expanded="false" />  
992 - <element signature="e#15347#16063#0#PHP" expanded="false" />  
993 - <element signature="e#16068#18608#0#PHP" expanded="false" />  
994 - <element signature="e#18614#19516#0#PHP" expanded="false" />  
995 - <element signature="e#19521#22326#0#PHP" expanded="false" />  
996 - <element signature="e#22332#22709#0#PHP" expanded="false" />  
997 - <element signature="e#22714#23156#0#PHP" expanded="false" />  
998 - <element signature="e#23159#23168#0#PHP" expanded="false" />  
999 - <element signature="e#23928#24433#0#PHP" expanded="false" />  
1000 - <element signature="e#24438#24689#0#PHP" expanded="false" />  
1001 - <element signature="e#24695#25174#0#PHP" expanded="false" />  
1002 - <element signature="e#25179#25936#0#PHP" expanded="false" />  
1003 - <element signature="e#25942#26423#0#PHP" expanded="false" />  
1004 - <element signature="e#26428#27198#0#PHP" expanded="false" />  
1005 - <element signature="e#27204#27567#0#PHP" expanded="false" />  
1006 - <element signature="e#27572#27763#0#PHP" expanded="false" />  
1007 - <element signature="e#27769#28127#0#PHP" expanded="false" />  
1008 - <element signature="e#28132#28323#0#PHP" expanded="false" />  
1009 - <element signature="e#28329#29472#0#PHP" expanded="false" />  
1010 - <element signature="e#29477#32142#0#PHP" expanded="false" />  
1011 - <element signature="e#32148#32646#0#PHP" expanded="false" />  
1012 - <element signature="e#32651#34397#0#PHP" expanded="false" />  
1013 - <element signature="e#34403#34816#0#PHP" expanded="false" />  
1014 - <element signature="e#34821#35300#0#PHP" expanded="false" />  
1015 - <element signature="e#35306#35840#0#PHP" expanded="false" />  
1016 - <element signature="e#35845#37230#0#PHP" expanded="false" />  
1017 - <element signature="e#37236#37890#0#PHP" expanded="false" />  
1018 - <element signature="e#37895#39910#0#PHP" expanded="false" />  
1019 - <element signature="e#39916#40676#0#PHP" expanded="false" />  
1020 - <element signature="e#40681#43390#0#PHP" expanded="false" />  
1021 - <element signature="e#43416#44247#0#PHP" expanded="false" />  
1022 - <element signature="e#44253#44673#0#PHP" expanded="false" />  
1023 - <element signature="e#44678#45161#0#PHP" expanded="false" />  
1024 - <element signature="e#45167#45973#0#PHP" expanded="false" />  
1025 - <element signature="e#45978#49136#0#PHP" expanded="false" />  
1026 - <element signature="e#46357#49130#0#PHP" expanded="false" />  
1027 - <element signature="e#49151#50486#0#PHP" expanded="false" />  
1028 - <element signature="e#50502#51536#0#PHP" expanded="false" />  
1029 - <element signature="e#51542#52300#0#PHP" expanded="false" />  
1030 - <element signature="e#52305#56048#0#PHP" expanded="false" />  
1031 - <element signature="e#56054#56446#0#PHP" expanded="false" />  
1032 - <element signature="e#56451#57403#0#PHP" expanded="false" />  
1033 - <element signature="e#57427#58000#0#PHP" expanded="false" />  
1034 - <element signature="e#58006#58605#0#PHP" expanded="false" />  
1035 - <element signature="e#58610#59537#0#PHP" expanded="false" />  
1036 - <element signature="e#59543#60257#0#PHP" expanded="false" />  
1037 - <element signature="e#60263#60690#0#PHP" expanded="false" />  
1038 - <element signature="e#60695#61164#0#PHP" expanded="false" />  
1039 - <element signature="e#61171#62376#0#PHP" expanded="false" />  
1040 - <element signature="e#62381#64084#0#PHP" expanded="false" />  
1041 - <element signature="e#64090#64867#0#PHP" expanded="false" />  
1042 - <element signature="e#64872#68810#0#PHP" expanded="false" />  
1043 - <element signature="e#68816#69325#0#PHP" expanded="false" />  
1044 - <element signature="e#69330#70002#0#PHP" expanded="false" />  
1045 - </folding>  
1046 </state> 824 </state>
1047 </provider> 825 </provider>
1048 </entry> 826 </entry>
1049 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 827 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
1050 <provider selected="true" editor-type-id="text-editor"> 828 <provider selected="true" editor-type-id="text-editor">
1051 - <state relative-caret-position="505">  
1052 - <caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" /> 829 + <state relative-caret-position="775">
  830 + <caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
1053 <folding> 831 <folding>
1054 <element signature="e#631#922#0#PHP" expanded="false" /> 832 <element signature="e#631#922#0#PHP" expanded="false" />
1055 <element signature="e#928#2350#0#PHP" expanded="false" /> 833 <element signature="e#928#2350#0#PHP" expanded="false" />
  834 + <element signature="e#2356#11938#0#PHP" expanded="false" />
  835 + <element signature="e#11971#14157#0#PHP" expanded="false" />
1056 <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." /> 836 <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
1057 <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." /> 837 <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
1058 <marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." /> 838 <marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />
@@ -1249,5 +1029,120 @@ @@ -1249,5 +1029,120 @@
1249 </state> 1029 </state>
1250 </provider> 1030 </provider>
1251 </entry> 1031 </entry>
  1032 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
  1033 + <provider selected="true" editor-type-id="text-editor">
  1034 + <state relative-caret-position="513">
  1035 + <caret line="184" column="0" lean-forward="true" selection-start-line="184" selection-start-column="0" selection-end-line="184" selection-end-column="0" />
  1036 + <folding>
  1037 + <element signature="e#700#2169#0#PHP" expanded="false" />
  1038 + <element signature="e#2201#5830#0#PHP" expanded="false" />
  1039 + <element signature="e#9580#9824#0#PHP" expanded="false" />
  1040 + </folding>
  1041 + </state>
  1042 + </provider>
  1043 + </entry>
  1044 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  1045 + <provider selected="true" editor-type-id="text-editor">
  1046 + <state relative-caret-position="218">
  1047 + <caret line="34" column="135" lean-forward="false" selection-start-line="34" selection-start-column="135" selection-end-line="34" selection-end-column="135" />
  1048 + <folding />
  1049 + </state>
  1050 + </provider>
  1051 + </entry>
  1052 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
  1053 + <provider selected="true" editor-type-id="text-editor">
  1054 + <state relative-caret-position="1900">
  1055 + <caret line="94" column="10" lean-forward="false" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
  1056 + <folding />
  1057 + </state>
  1058 + </provider>
  1059 + </entry>
  1060 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  1061 + <provider selected="true" editor-type-id="text-editor">
  1062 + <state relative-caret-position="315">
  1063 + <caret line="796" column="5" lean-forward="true" selection-start-line="796" selection-start-column="5" selection-end-line="796" selection-end-column="5" />
  1064 + <folding>
  1065 + <element signature="e#544#1282#0#PHP" expanded="false" />
  1066 + <element signature="e#1287#2950#0#PHP" expanded="false" />
  1067 + <element signature="e#2956#3318#0#PHP" expanded="false" />
  1068 + <element signature="e#3323#3613#0#PHP" expanded="false" />
  1069 + <element signature="e#3619#3941#0#PHP" expanded="false" />
  1070 + <element signature="e#3946#4233#0#PHP" expanded="false" />
  1071 + <element signature="e#4240#4674#0#PHP" expanded="false" />
  1072 + <element signature="e#4679#5037#0#PHP" expanded="false" />
  1073 + <element signature="e#5043#5450#0#PHP" expanded="false" />
  1074 + <element signature="e#5455#5798#0#PHP" expanded="false" />
  1075 + <element signature="e#5804#6217#0#PHP" expanded="false" />
  1076 + <element signature="e#6222#6539#0#PHP" expanded="false" />
  1077 + <element signature="e#6545#7633#0#PHP" expanded="false" />
  1078 + <element signature="e#7638#8356#0#PHP" expanded="false" />
  1079 + <element signature="e#8362#9042#0#PHP" expanded="false" />
  1080 + <element signature="e#9047#9960#0#PHP" expanded="false" />
  1081 + <element signature="e#9966#10755#0#PHP" expanded="false" />
  1082 + <element signature="e#10760#12109#0#PHP" expanded="false" />
  1083 + <element signature="e#12115#12817#0#PHP" expanded="false" />
  1084 + <element signature="e#12822#14142#0#PHP" expanded="false" />
  1085 + <element signature="e#14148#14724#0#PHP" expanded="false" />
  1086 + <element signature="e#14729#15341#0#PHP" expanded="false" />
  1087 + <element signature="e#15347#16063#0#PHP" expanded="false" />
  1088 + <element signature="e#16068#18608#0#PHP" expanded="false" />
  1089 + <element signature="e#18614#19544#0#PHP" expanded="false" />
  1090 + <element signature="e#19549#23599#0#PHP" expanded="false" />
  1091 + <element signature="e#19777#23593#0#PHP" expanded="false" />
  1092 + <element signature="e#23605#23982#0#PHP" expanded="false" />
  1093 + <element signature="e#23987#24429#0#PHP" expanded="false" />
  1094 + <element signature="e#24435#24985#0#PHP" expanded="false" />
  1095 + <element signature="e#24990#26504#0#PHP" expanded="false" />
  1096 + <element signature="e#26507#26516#0#PHP" expanded="false" />
  1097 + <element signature="e#27276#27781#0#PHP" expanded="false" />
  1098 + <element signature="e#27786#28037#0#PHP" expanded="false" />
  1099 + <element signature="e#28043#28522#0#PHP" expanded="false" />
  1100 + <element signature="e#28527#29284#0#PHP" expanded="false" />
  1101 + <element signature="e#29290#29771#0#PHP" expanded="false" />
  1102 + <element signature="e#29776#30546#0#PHP" expanded="false" />
  1103 + <element signature="e#30552#30915#0#PHP" expanded="false" />
  1104 + <element signature="e#30920#31111#0#PHP" expanded="false" />
  1105 + <element signature="e#31117#31475#0#PHP" expanded="false" />
  1106 + <element signature="e#31480#31671#0#PHP" expanded="false" />
  1107 + <element signature="e#31677#32820#0#PHP" expanded="false" />
  1108 + <element signature="e#32825#35490#0#PHP" expanded="false" />
  1109 + <element signature="e#35496#35994#0#PHP" expanded="false" />
  1110 + <element signature="e#35999#37745#0#PHP" expanded="false" />
  1111 + <element signature="e#37751#38164#0#PHP" expanded="false" />
  1112 + <element signature="e#38169#38648#0#PHP" expanded="false" />
  1113 + <element signature="e#38654#39188#0#PHP" expanded="false" />
  1114 + <element signature="e#39193#40578#0#PHP" expanded="false" />
  1115 + <element signature="e#40584#41238#0#PHP" expanded="false" />
  1116 + <element signature="e#41243#43258#0#PHP" expanded="false" />
  1117 + <element signature="e#43264#44024#0#PHP" expanded="false" />
  1118 + <element signature="e#44029#46738#0#PHP" expanded="false" />
  1119 + <element signature="e#46764#47595#0#PHP" expanded="false" />
  1120 + <element signature="e#47601#48021#0#PHP" expanded="false" />
  1121 + <element signature="e#48026#48509#0#PHP" expanded="false" />
  1122 + <element signature="e#48515#49321#0#PHP" expanded="false" />
  1123 + <element signature="e#49326#52484#0#PHP" expanded="false" />
  1124 + <element signature="e#49705#52478#0#PHP" expanded="false" />
  1125 + <element signature="e#52499#53834#0#PHP" expanded="false" />
  1126 + <element signature="e#53850#54884#0#PHP" expanded="false" />
  1127 + <element signature="e#54890#55648#0#PHP" expanded="false" />
  1128 + <element signature="e#55653#59396#0#PHP" expanded="false" />
  1129 + <element signature="e#59402#59794#0#PHP" expanded="false" />
  1130 + <element signature="e#59799#60751#0#PHP" expanded="false" />
  1131 + <element signature="e#60775#61348#0#PHP" expanded="false" />
  1132 + <element signature="e#61354#61953#0#PHP" expanded="false" />
  1133 + <element signature="e#61958#62885#0#PHP" expanded="false" />
  1134 + <element signature="e#62891#63605#0#PHP" expanded="false" />
  1135 + <element signature="e#63611#64038#0#PHP" expanded="false" />
  1136 + <element signature="e#64043#64512#0#PHP" expanded="false" />
  1137 + <element signature="e#64519#65724#0#PHP" expanded="false" />
  1138 + <element signature="e#65729#67432#0#PHP" expanded="false" />
  1139 + <element signature="e#67438#68215#0#PHP" expanded="false" />
  1140 + <element signature="e#68220#72158#0#PHP" expanded="false" />
  1141 + <element signature="e#72164#72673#0#PHP" expanded="false" />
  1142 + <element signature="e#72678#73350#0#PHP" expanded="false" />
  1143 + </folding>
  1144 + </state>
  1145 + </provider>
  1146 + </entry>
1252 </component> 1147 </component>
1253 </project> 1148 </project>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <div class="form-group"> 32 <div class="form-group">
33 <label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label> 33 <label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
34 <div class="col-xs-12 col-sm-8"> 34 <div class="col-xs-12 col-sm-8">
35 - <input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" placeholder="请输入视频关键词(多个用英文逗号隔开)"> 35 + <input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" placeholder="请输入视频关键词(多个用空格隔开)">
36 </div> 36 </div>
37 </div> 37 </div>
38 <div class="form-group"> 38 <div class="form-group">
@@ -586,6 +586,7 @@ class User extends Api @@ -586,6 +586,7 @@ class User extends Api
586 "data": { 586 "data": {
587 "id": 4,//视频id, 587 "id": 4,//视频id,
588 "title"://标题 588 "title"://标题
  589 + "keyword"://关键字
589 "accredit": //授权书图片 590 "accredit": //授权书图片
590 "thumbnail": //视频封面图, 591 "thumbnail": //视频封面图,
591 "video": //2K视频地址, 592 "video": //2K视频地址,
@@ -615,15 +616,29 @@ class User extends Api @@ -615,15 +616,29 @@ class User extends Api
615 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 616 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
616 } 617 }
617 $data = Db::name('video') 618 $data = Db::name('video')
618 - ->field('id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content') 619 + ->field('text_ids,address_ids,keyword,id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content')
619 ->where('id',$pic_id) 620 ->where('id',$pic_id)
620 ->find(); 621 ->find();
  622 + $keyword = str_replace(' ',',',$data['keyword']);
621 if(empty($data)){ 623 if(empty($data)){
622 $this->error(['code'=>2,'msg'=>'参数错误']); 624 $this->error(['code'=>2,'msg'=>'参数错误']);
623 } 625 }
624 if(empty($data['eight_price'])){ 626 if(empty($data['eight_price'])){
625 $data['eight_price'] = 0; 627 $data['eight_price'] = 0;
626 } 628 }
  629 +
  630 + //单取出所有关键字合并数组
  631 + $text_ids = explode(',',trim($data['text_ids'],','));
  632 + $address_ids = explode(',',trim($data['address_ids'],','));
  633 + $words = array_merge($text_ids,$address_ids);
  634 +
  635 + $keywords = Db::name('words')
  636 + ->whereIn('id',$words)
  637 + ->column('name');
  638 + $keywords = implode(',',$keywords);
  639 + $key = $keywords.','.$keyword;
  640 + $data['keyword'] = explode(',',$key);
  641 +
627 $accredit = Db::name('accredit') 642 $accredit = Db::name('accredit')
628 ->where('id',1) 643 ->where('id',1)
629 ->find(); 644 ->find();
@@ -643,12 +658,27 @@ class User extends Api @@ -643,12 +658,27 @@ class User extends Api
643 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 658 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
644 } 659 }
645 $data = Db::name('video') 660 $data = Db::name('video')
646 - ->field('id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content') 661 + ->field('text_ids,address_ids,keyword,id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content')
647 ->where('id',$pic_id) 662 ->where('id',$pic_id)
648 ->find(); 663 ->find();
  664 + $keyword = str_replace(' ',',',$data['keyword']);
649 if(empty($data)){ 665 if(empty($data)){
650 $this->error(['code'=>2,'msg'=>'参数错误']); 666 $this->error(['code'=>2,'msg'=>'参数错误']);
651 } 667 }
  668 + if(empty($data['eight_price'])){
  669 + $data['eight_price'] = 0;
  670 + }
  671 + //单取出所有关键字合并数组
  672 + $text_ids = explode(',',trim($data['text_ids'],','));
  673 + $address_ids = explode(',',trim($data['address_ids'],','));
  674 + $words = array_merge($text_ids,$address_ids);
  675 +
  676 + $keywords = Db::name('words')
  677 + ->whereIn('id',$words)
  678 + ->column('name');
  679 + $keywords = implode(',',$keywords);
  680 + $key = $keywords.','.$keyword;
  681 + $data['keyword'] = explode(',',$key);
652 $accredit = Db::name('accredit') 682 $accredit = Db::name('accredit')
653 ->where('id',1) 683 ->where('id',1)
654 ->find(); 684 ->find();
@@ -700,6 +730,72 @@ class User extends Api @@ -700,6 +730,72 @@ class User extends Api
700 $this->success('success',$data); 730 $this->success('success',$data);
701 } 731 }
702 732
  733 + /**
  734 + * @ApiTitle (通过详情页关键词搜索)
  735 + * @ApiSummary (通过详情页关键词搜索)
  736 + * @ApiMethod (POST)
  737 + * @ApiRoute (/api/user/search_key)
  738 + *
  739 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  740 + * @ApiParams (name="keyword", type=string, required=true, description="关键字")
  741 + *
  742 + *
  743 + * @ApiReturn({
  744 + "code": 1,
  745 + "msg": "成功",
  746 + "time": "1571492001",
  747 + "data": {
  748 + "id": //id,
  749 + "thumbnail": //视频封面,
  750 + "title"://视频标题
  751 + }
  752 + })
  753 + */
  754 + public function search_key()
  755 + {
  756 + $user_id = $this->uid;
  757 + $rule = config('verify.path');
  758 + $keyword = $this->request->param('keyword');
  759 + if(empty($keyword)){
  760 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  761 + }
  762 + //查出所有手动写入该关键词的素材ID
  763 + $hand_ids = Db::name('video')
  764 + ->where('keyword','like',"%$keyword%")
  765 + ->column('id');
  766 +
  767 + //根据用户点选的关键词搜索对应的关键词表找出该关键词是否存在，如果存在找出ID，继续查素材含有该ID的素材ID
  768 + $words_id = Db::name('words')
  769 + ->where('name',$keyword)
  770 + ->find();
  771 + if(empty($words_id)){
  772 + $words_ids = [];
  773 + }else{
  774 + if($words_id['type'] == 1){
  775 + $address_id = ','.$words_id['id'].',';
  776 + $words_ids = Db::name('video')
  777 + ->where('address_ids','like',"%$address_id%")
  778 + ->column('id');
  779 + }
  780 + if($words_id['type'] == 2){
  781 + $text_id = ','.$words_id['id'].',';
  782 + $words_ids = Db::name('video')
  783 + ->where('text_ids','like',"%$text_id%")
  784 + ->column('id');
  785 + }
  786 + }
  787 + //合并所有查出的数组ID
  788 + $public_ids = array_merge($hand_ids,$words_ids);
  789 + $data = Db::name('video')
  790 + ->whereIn('id',$public_ids)
  791 + ->field('id,title,thumbnail')
  792 + ->select();
  793 + foreach ($data as &$v){
  794 + $v['thumbnail'] = $rule.$v['thumbnail'];
  795 + }
  796 + $this->success('SUCCESS',$data);
  797 + }
  798 +
703 799
704 // /** 800 // /**
705 // * @ApiTitle (历史记录) 801 // * @ApiTitle (历史记录)
此 diff 太大无法显示。