郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 7ead93f461681f33d22f68157ca369f3c08f1707 1 个父辈 82a11c44
1 个管道 的构建 失败 耗费 9 秒

修改分享图

内嵌 并排对比
正在显示 17 个修改的文件 包含 416 行增加 和 556 行删除
@@ -2,7 +2,23 @@ @@ -2,7 +2,23 @@
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$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/pdf/2019120751985353.pdf" afterPath="$PROJECT_DIR$/public/pdf/2019120751985353.pdf" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/common/menu.html" afterPath="$PROJECT_DIR$/application/admin/view/common/menu.html" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
  15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
  17 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  18 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
  19 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
  20 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
  21 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
6 </list> 22 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 23 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 24 <option name="TRACKING_ENABLED" value="true" />
@@ -12,297 +28,7 @@ @@ -12,297 +28,7 @@
12 <option name="LAST_RESOLUTION" value="IGNORE" /> 28 <option name="LAST_RESOLUTION" value="IGNORE" />
13 </component> 29 </component>
14 <component name="FileEditorManager"> 30 <component name="FileEditorManager">
15 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">  
16 - <file leaf-file-name="Common.php" pinned="false" current-in-tab="true">  
17 - <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">  
18 - <provider selected="true" editor-type-id="text-editor">  
19 - <state relative-caret-position="364">  
20 - <caret line="152" column="39" lean-forward="true" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" />  
21 - <folding>  
22 - <element signature="e#38#68#0#PHP" expanded="true" />  
23 - <element signature="e#1222#1271#0#PHP" expanded="false" />  
24 - <element signature="e#9891#10022#0#PHP" expanded="false" />  
25 - <element signature="e#10027#10625#0#PHP" expanded="false" />  
26 - <element signature="e#10631#10708#0#PHP" expanded="false" />  
27 - <element signature="e#10713#14976#0#PHP" expanded="false" />  
28 - <marker date="1575942949956" expanded="true" signature="1639:9267" ph="..." />  
29 - <marker date="1575942949956" expanded="false" signature="1657:1792" ph="..." />  
30 - <marker date="1575942949956" expanded="false" signature="1677:1743" ph="..." />  
31 - <marker date="1575942949956" expanded="false" signature="1816:1863" ph="..." />  
32 - <marker date="1575942949956" expanded="false" signature="1864:1902" ph="..." />  
33 - <marker date="1575942949956" expanded="true" signature="1926:1973" ph="..." />  
34 - <marker date="1575942949956" expanded="true" signature="1974:2129" ph="..." />  
35 - <marker date="1575942949956" expanded="true" signature="2153:2172" ph="..." />  
36 - <marker date="1575942949956" expanded="true" signature="2173:3073" ph="..." />  
37 - <marker date="1575942949956" expanded="true" signature="2228:2275" ph="..." />  
38 - <marker date="1575942949956" expanded="true" signature="2228:2276" ph="..." />  
39 - <marker date="1575942949956" expanded="true" signature="2228:2311" ph="..." />  
40 - <marker date="1575942949956" expanded="false" signature="2261:2273" ph="..." />  
41 - <marker date="1575942949956" expanded="true" signature="2366:2414" ph="..." />  
42 - <marker date="1575942949956" expanded="true" signature="2366:2415" ph="..." />  
43 - <marker date="1575942949956" expanded="true" signature="2366:2449" ph="..." />  
44 - <marker date="1575942949956" expanded="false" signature="2400:2412" ph="..." />  
45 - <marker date="1575942949956" expanded="true" signature="2504:2551" ph="..." />  
46 - <marker date="1575942949956" expanded="true" signature="2504:2552" ph="..." />  
47 - <marker date="1575942949956" expanded="true" signature="2504:2586" ph="..." />  
48 - <marker date="1575942949956" expanded="false" signature="2537:2549" ph="..." />  
49 - <marker date="1575942949956" expanded="true" signature="2641:2689" ph="..." />  
50 - <marker date="1575942949956" expanded="true" signature="2641:2746" ph="..." />  
51 - <marker date="1575942949956" expanded="true" signature="2641:2787" ph="..." />  
52 - <marker date="1575942949956" expanded="true" signature="2675:2687" ph="..." />  
53 - <marker date="1575942949956" expanded="true" signature="2728:2744" ph="..." />  
54 - <marker date="1575942949956" expanded="true" signature="2842:2896" ph="..." />  
55 - <marker date="1575942949956" expanded="true" signature="2842:2932" ph="..." />  
56 - <marker date="1575942949956" expanded="false" signature="2883:2895" ph="..." />  
57 - <marker date="1575942949956" expanded="true" signature="2987:3056" ph="..." />  
58 - <marker date="1575942949956" expanded="false" signature="3097:3115" ph="..." />  
59 - <marker date="1575942949956" expanded="true" signature="3116:3533" ph="..." />  
60 - <marker date="1575942949956" expanded="false" signature="3144:3210" ph="..." />  
61 - <marker date="1575942949956" expanded="false" signature="3253:3298" ph="..." />  
62 - <marker date="1575942949956" expanded="true" signature="3300:3306" ph=" " />  
63 - <marker date="1575942949956" expanded="true" signature="3306:3312" ph=" " />  
64 - <marker date="1575942949956" expanded="true" signature="3312:3318" ph=" " />  
65 - <marker date="1575942949956" expanded="true" signature="3318:3324" ph=" " />  
66 - <marker date="1575942949956" expanded="false" signature="3343:3352" ph="..." />  
67 - <marker date="1575942949956" expanded="false" signature="3395:3404" ph="..." />  
68 - <marker date="1575942949956" expanded="false" signature="3433:3442" ph="..." />  
69 - <marker date="1575942949956" expanded="false" signature="3557:3575" ph="..." />  
70 - <marker date="1575942949956" expanded="true" signature="3576:3892" ph="..." />  
71 - <marker date="1575942949956" expanded="false" signature="3604:3670" ph="..." />  
72 - <marker date="1575942949956" expanded="false" signature="3709:3737" ph="..." />  
73 - <marker date="1575942949956" expanded="true" signature="3739:3745" ph=" " />  
74 - <marker date="1575942949956" expanded="true" signature="3745:3751" ph=" " />  
75 - <marker date="1575942949956" expanded="true" signature="3751:3757" ph=" " />  
76 - <marker date="1575942949956" expanded="true" signature="3757:3763" ph=" " />  
77 - <marker date="1575942949956" expanded="false" signature="3816:3825" ph="..." />  
78 - <marker date="1575942949956" expanded="false" signature="3916:3934" ph="..." />  
79 - <marker date="1575942949956" expanded="true" signature="3935:4294" ph="..." />  
80 - <marker date="1575942949956" expanded="false" signature="3963:4029" ph="..." />  
81 - <marker date="1575942949956" expanded="false" signature="4070:4115" ph="..." />  
82 - <marker date="1575942949956" expanded="false" signature="4117:4123" ph=" " />  
83 - <marker date="1575942949956" expanded="false" signature="4123:4129" ph=" " />  
84 - <marker date="1575942949956" expanded="false" signature="4129:4135" ph=" " />  
85 - <marker date="1575942949956" expanded="false" signature="4135:4141" ph=" " />  
86 - <marker date="1575942949956" expanded="false" signature="4224:4233" ph="..." />  
87 - <marker date="1575942949956" expanded="false" signature="4318:4365" ph="..." />  
88 - <marker date="1575942949956" expanded="false" signature="4367:4373" ph=" " />  
89 - <marker date="1575942949956" expanded="false" signature="4373:4379" ph=" " />  
90 - <marker date="1575942949956" expanded="false" signature="4379:4385" ph=" " />  
91 - <marker date="1575942949956" expanded="false" signature="4385:4391" ph=" " />  
92 - <marker date="1575942949956" expanded="false" signature="4446:4455" ph="..." />  
93 - <marker date="1575942949956" expanded="false" signature="4574:4621" ph="..." />  
94 - <marker date="1575942949956" expanded="false" signature="4623:4629" ph=" " />  
95 - <marker date="1575942949956" expanded="false" signature="4629:4635" ph=" " />  
96 - <marker date="1575942949956" expanded="false" signature="4635:4641" ph=" " />  
97 - <marker date="1575942949956" expanded="false" signature="4641:4647" ph=" " />  
98 - <marker date="1575942949956" expanded="false" signature="4701:4710" ph="..." />  
99 - <marker date="1575942949956" expanded="false" signature="4784:4800" ph="..." />  
100 - <marker date="1575942949956" expanded="false" signature="4853:4900" ph="..." />  
101 - <marker date="1575942949956" expanded="false" signature="4902:4908" ph=" " />  
102 - <marker date="1575942949956" expanded="false" signature="4908:4914" ph=" " />  
103 - <marker date="1575942949956" expanded="false" signature="4914:4920" ph=" " />  
104 - <marker date="1575942949956" expanded="false" signature="4920:4926" ph=" " />  
105 - <marker date="1575942949956" expanded="false" signature="4954:4980" ph="..." />  
106 - <marker date="1575942949956" expanded="false" signature="5066:5084" ph="..." />  
107 - <marker date="1575942949956" expanded="true" signature="5085:5683" ph="..." />  
108 - <marker date="1575942949956" expanded="false" signature="5113:5179" ph="..." />  
109 - <marker date="1575942949956" expanded="false" signature="5218:5265" ph="..." />  
110 - <marker date="1575942949956" expanded="false" signature="5267:5273" ph=" " />  
111 - <marker date="1575942949956" expanded="false" signature="5273:5279" ph=" " />  
112 - <marker date="1575942949956" expanded="false" signature="5279:5285" ph=" " />  
113 - <marker date="1575942949956" expanded="false" signature="5285:5291" ph=" " />  
114 - <marker date="1575942949956" expanded="false" signature="5376:5423" ph="..." />  
115 - <marker date="1575942949956" expanded="false" signature="5425:5431" ph=" " />  
116 - <marker date="1575942949956" expanded="false" signature="5431:5437" ph=" " />  
117 - <marker date="1575942949956" expanded="false" signature="5437:5443" ph=" " />  
118 - <marker date="1575942949956" expanded="false" signature="5443:5449" ph=" " />  
119 - <marker date="1575942949956" expanded="false" signature="5550:5597" ph="..." />  
120 - <marker date="1575942949956" expanded="false" signature="5599:5605" ph=" " />  
121 - <marker date="1575942949956" expanded="false" signature="5605:5611" ph=" " />  
122 - <marker date="1575942949956" expanded="false" signature="5611:5617" ph=" " />  
123 - <marker date="1575942949956" expanded="false" signature="5617:5623" ph=" " />  
124 - <marker date="1575942949956" expanded="false" signature="5707:5725" ph="..." />  
125 - <marker date="1575942949956" expanded="true" signature="5726:7409" ph="..." />  
126 - <marker date="1575942949956" expanded="false" signature="5754:5820" ph="..." />  
127 - <marker date="1575942949956" expanded="false" signature="5859:5906" ph="..." />  
128 - <marker date="1575942949956" expanded="false" signature="5908:5914" ph=" " />  
129 - <marker date="1575942949956" expanded="false" signature="5914:5920" ph=" " />  
130 - <marker date="1575942949956" expanded="false" signature="5920:5926" ph=" " />  
131 - <marker date="1575942949956" expanded="false" signature="5926:5932" ph=" " />  
132 - <marker date="1575942949956" expanded="false" signature="5958:5974" ph="..." />  
133 - <marker date="1575942949956" expanded="false" signature="6094:6141" ph="..." />  
134 - <marker date="1575942949956" expanded="false" signature="6143:6149" ph=" " />  
135 - <marker date="1575942949956" expanded="false" signature="6149:6155" ph=" " />  
136 - <marker date="1575942949956" expanded="false" signature="6155:6161" ph=" " />  
137 - <marker date="1575942949956" expanded="false" signature="6161:6167" ph=" " />  
138 - <marker date="1575942949956" expanded="false" signature="6319:6366" ph="..." />  
139 - <marker date="1575942949956" expanded="false" signature="6368:6374" ph=" " />  
140 - <marker date="1575942949956" expanded="false" signature="6374:6380" ph=" " />  
141 - <marker date="1575942949956" expanded="false" signature="6380:6386" ph=" " />  
142 - <marker date="1575942949956" expanded="false" signature="6386:6392" ph=" " />  
143 - <marker date="1575942949956" expanded="false" signature="6511:6558" ph="..." />  
144 - <marker date="1575942949956" expanded="false" signature="6560:6566" ph=" " />  
145 - <marker date="1575942949956" expanded="false" signature="6566:6572" ph=" " />  
146 - <marker date="1575942949956" expanded="false" signature="6572:6578" ph=" " />  
147 - <marker date="1575942949956" expanded="false" signature="6578:6584" ph=" " />  
148 - <marker date="1575942949956" expanded="false" signature="6668:6715" ph="..." />  
149 - <marker date="1575942949956" expanded="false" signature="6717:6723" ph=" " />  
150 - <marker date="1575942949956" expanded="false" signature="6723:6729" ph=" " />  
151 - <marker date="1575942949956" expanded="false" signature="6729:6735" ph=" " />  
152 - <marker date="1575942949956" expanded="false" signature="6735:6741" ph=" " />  
153 - <marker date="1575942949956" expanded="false" signature="6801:6848" ph="..." />  
154 - <marker date="1575942949956" expanded="false" signature="6850:6856" ph=" " />  
155 - <marker date="1575942949956" expanded="false" signature="6856:6862" ph=" " />  
156 - <marker date="1575942949956" expanded="false" signature="6862:6868" ph=" " />  
157 - <marker date="1575942949956" expanded="false" signature="6868:6874" ph=" " />  
158 - <marker date="1575942949956" expanded="false" signature="7058:7105" ph="..." />  
159 - <marker date="1575942949956" expanded="false" signature="7107:7113" ph=" " />  
160 - <marker date="1575942949956" expanded="false" signature="7113:7119" ph=" " />  
161 - <marker date="1575942949956" expanded="false" signature="7119:7125" ph=" " />  
162 - <marker date="1575942949956" expanded="false" signature="7125:7131" ph=" " />  
163 - <marker date="1575942949956" expanded="false" signature="7259:7306" ph="..." />  
164 - <marker date="1575942949956" expanded="false" signature="7308:7314" ph=" " />  
165 - <marker date="1575942949956" expanded="false" signature="7314:7320" ph=" " />  
166 - <marker date="1575942949956" expanded="false" signature="7320:7326" ph=" " />  
167 - <marker date="1575942949956" expanded="false" signature="7326:7332" ph=" " />  
168 - <marker date="1575942949956" expanded="false" signature="7433:7451" ph="..." />  
169 - <marker date="1575942949956" expanded="true" signature="7452:7952" ph="..." />  
170 - <marker date="1575942949956" expanded="false" signature="7480:7546" ph="..." />  
171 - <marker date="1575942949956" expanded="false" signature="7587:7634" ph="..." />  
172 - <marker date="1575942949956" expanded="false" signature="7636:7642" ph=" " />  
173 - <marker date="1575942949956" expanded="false" signature="7642:7648" ph=" " />  
174 - <marker date="1575942949956" expanded="false" signature="7648:7654" ph=" " />  
175 - <marker date="1575942949956" expanded="false" signature="7654:7660" ph=" " />  
176 - <marker date="1575942949956" expanded="false" signature="7772:7819" ph="..." />  
177 - <marker date="1575942949956" expanded="false" signature="7821:7827" ph=" " />  
178 - <marker date="1575942949956" expanded="false" signature="7827:7833" ph=" " />  
179 - <marker date="1575942949956" expanded="false" signature="7833:7839" ph=" " />  
180 - <marker date="1575942949956" expanded="false" signature="7839:7845" ph=" " />  
181 - <marker date="1575942949956" expanded="false" signature="7976:7994" ph="..." />  
182 - <marker date="1575942949956" expanded="true" signature="7995:8995" ph="..." />  
183 - <marker date="1575942949956" expanded="false" signature="8023:8089" ph="..." />  
184 - <marker date="1575942949956" expanded="false" signature="8128:8175" ph="..." />  
185 - <marker date="1575942949956" expanded="false" signature="8177:8183" ph=" " />  
186 - <marker date="1575942949956" expanded="false" signature="8183:8189" ph=" " />  
187 - <marker date="1575942949956" expanded="false" signature="8189:8195" ph=" " />  
188 - <marker date="1575942949956" expanded="false" signature="8195:8201" ph=" " />  
189 - <marker date="1575942949956" expanded="false" signature="8267:8314" ph="..." />  
190 - <marker date="1575942949956" expanded="false" signature="8316:8322" ph=" " />  
191 - <marker date="1575942949956" expanded="false" signature="8322:8328" ph=" " />  
192 - <marker date="1575942949956" expanded="false" signature="8328:8334" ph=" " />  
193 - <marker date="1575942949956" expanded="false" signature="8334:8340" ph=" " />  
194 - <marker date="1575942949956" expanded="false" signature="8397:8444" ph="..." />  
195 - <marker date="1575942949956" expanded="false" signature="8446:8452" ph=" " />  
196 - <marker date="1575942949956" expanded="false" signature="8452:8458" ph=" " />  
197 - <marker date="1575942949956" expanded="false" signature="8458:8464" ph=" " />  
198 - <marker date="1575942949956" expanded="false" signature="8464:8470" ph=" " />  
199 - <marker date="1575942949956" expanded="false" signature="8548:8595" ph="..." />  
200 - <marker date="1575942949956" expanded="false" signature="8597:8603" ph=" " />  
201 - <marker date="1575942949956" expanded="false" signature="8603:8609" ph=" " />  
202 - <marker date="1575942949956" expanded="false" signature="8609:8615" ph=" " />  
203 - <marker date="1575942949956" expanded="false" signature="8615:8621" ph=" " />  
204 - <marker date="1575942949956" expanded="false" signature="8714:8761" ph="..." />  
205 - <marker date="1575942949956" expanded="false" signature="8763:8769" ph=" " />  
206 - <marker date="1575942949956" expanded="false" signature="8769:8775" ph=" " />  
207 - <marker date="1575942949956" expanded="false" signature="8775:8781" ph=" " />  
208 - <marker date="1575942949956" expanded="false" signature="8781:8787" ph=" " />  
209 - <marker date="1575942949956" expanded="false" signature="8861:8908" ph="..." />  
210 - <marker date="1575942949956" expanded="false" signature="8910:8916" ph=" " />  
211 - <marker date="1575942949956" expanded="false" signature="8916:8922" ph=" " />  
212 - <marker date="1575942949956" expanded="false" signature="8922:8928" ph=" " />  
213 - <marker date="1575942949956" expanded="false" signature="8928:8934" ph=" " />  
214 - <marker date="1575942949956" expanded="false" signature="9019:9099" ph="..." />  
215 - <marker date="1575942949956" expanded="false" signature="9160:9240" ph="..." />  
216 - </folding>  
217 - </state>  
218 - </provider>  
219 - </entry>  
220 - </file>  
221 - <file leaf-file-name="User.php" pinned="false" current-in-tab="false">  
222 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">  
223 - <provider selected="true" editor-type-id="text-editor">  
224 - <state relative-caret-position="428">  
225 - <caret line="1937" column="115" lean-forward="false" selection-start-line="1937" selection-start-column="115" selection-end-line="1937" selection-end-column="115" />  
226 - <folding>  
227 - <element signature="e#365#484#0#PHP" expanded="false" />  
228 - <element signature="e#490#1228#0#PHP" expanded="false" />  
229 - <element signature="e#1233#2896#0#PHP" expanded="false" />  
230 - <element signature="e#1266#2890#0#PHP" expanded="false" />  
231 - <element signature="e#2902#3430#0#PHP" expanded="false" />  
232 - <element signature="e#3435#4571#0#PHP" expanded="false" />  
233 - <element signature="e#4577#4984#0#PHP" expanded="false" />  
234 - <element signature="e#4989#5332#0#PHP" expanded="false" />  
235 - <element signature="e#5338#5751#0#PHP" expanded="false" />  
236 - <element signature="e#5756#6104#0#PHP" expanded="false" />  
237 - <element signature="e#6110#6947#0#PHP" expanded="false" />  
238 - <element signature="e#6952#9147#0#PHP" expanded="false" />  
239 - <element signature="e#9153#9833#0#PHP" expanded="false" />  
240 - <element signature="e#9838#10691#0#PHP" expanded="false" />  
241 - <element signature="e#10697#11486#0#PHP" expanded="false" />  
242 - <element signature="e#11491#12839#0#PHP" expanded="false" />  
243 - <element signature="e#12845#13547#0#PHP" expanded="false" />  
244 - <element signature="e#13552#14752#0#PHP" expanded="false" />  
245 - <element signature="e#14758#15334#0#PHP" expanded="false" />  
246 - <element signature="e#15339#15900#0#PHP" expanded="false" />  
247 - <element signature="e#15906#16622#0#PHP" expanded="false" />  
248 - <element signature="e#16627#19053#0#PHP" expanded="false" />  
249 - <element signature="e#19059#19961#0#PHP" expanded="false" />  
250 - <element signature="e#19966#22792#0#PHP" expanded="false" />  
251 - <element signature="e#22798#23175#0#PHP" expanded="false" />  
252 - <element signature="e#23180#23501#0#PHP" expanded="false" />  
253 - <element signature="e#23507#24012#0#PHP" expanded="false" />  
254 - <element signature="e#24017#24268#0#PHP" expanded="false" />  
255 - <element signature="e#24274#24753#0#PHP" expanded="false" />  
256 - <element signature="e#24758#25515#0#PHP" expanded="false" />  
257 - <element signature="e#25521#26002#0#PHP" expanded="false" />  
258 - <element signature="e#26007#26777#0#PHP" expanded="false" />  
259 - <element signature="e#26783#27146#0#PHP" expanded="false" />  
260 - <element signature="e#27151#27342#0#PHP" expanded="false" />  
261 - <element signature="e#27348#27706#0#PHP" expanded="false" />  
262 - <element signature="e#27711#27902#0#PHP" expanded="false" />  
263 - <element signature="e#27908#29051#0#PHP" expanded="false" />  
264 - <element signature="e#29056#31721#0#PHP" expanded="false" />  
265 - <element signature="e#31727#32225#0#PHP" expanded="false" />  
266 - <element signature="e#32230#33976#0#PHP" expanded="false" />  
267 - <element signature="e#33982#34395#0#PHP" expanded="false" />  
268 - <element signature="e#34400#34879#0#PHP" expanded="false" />  
269 - <element signature="e#34885#35419#0#PHP" expanded="false" />  
270 - <element signature="e#35424#36809#0#PHP" expanded="false" />  
271 - <element signature="e#36815#37469#0#PHP" expanded="false" />  
272 - <element signature="e#37474#39489#0#PHP" expanded="false" />  
273 - <element signature="e#39495#40255#0#PHP" expanded="false" />  
274 - <element signature="e#40260#42969#0#PHP" expanded="false" />  
275 - <element signature="e#42995#43826#0#PHP" expanded="false" />  
276 - <element signature="e#43832#44252#0#PHP" expanded="false" />  
277 - <element signature="e#44257#44740#0#PHP" expanded="false" />  
278 - <element signature="e#44746#45552#0#PHP" expanded="false" />  
279 - <element signature="e#45557#48715#0#PHP" expanded="false" />  
280 - <element signature="e#48730#50065#0#PHP" expanded="false" />  
281 - <element signature="e#50081#51115#0#PHP" expanded="false" />  
282 - <element signature="e#51121#51879#0#PHP" expanded="false" />  
283 - <element signature="e#51884#55627#0#PHP" expanded="false" />  
284 - <element signature="e#55633#56025#0#PHP" expanded="false" />  
285 - <element signature="e#56030#56982#0#PHP" expanded="false" />  
286 - <element signature="e#57006#57579#0#PHP" expanded="false" />  
287 - <element signature="e#57585#58184#0#PHP" expanded="false" />  
288 - <element signature="e#58189#59116#0#PHP" expanded="false" />  
289 - <element signature="e#59122#59836#0#PHP" expanded="false" />  
290 - <element signature="e#59842#60269#0#PHP" expanded="false" />  
291 - <element signature="e#60274#60743#0#PHP" expanded="false" />  
292 - <element signature="e#60750#61955#0#PHP" expanded="false" />  
293 - <element signature="e#61960#63663#0#PHP" expanded="false" />  
294 - <element signature="e#62107#62446#1#PHP" expanded="false" />  
295 - <element signature="e#62476#62830#1#PHP" expanded="false" />  
296 - <element signature="e#63669#64535#0#PHP" expanded="false" />  
297 - <element signature="e#64735#64872#1#PHP" expanded="false" />  
298 - <element signature="e#64902#65042#1#PHP" expanded="false" />  
299 - <element signature="e#65712#65796#0#PHP" expanded="false" />  
300 - </folding>  
301 - </state>  
302 - </provider>  
303 - </entry>  
304 - </file>  
305 - </leaf> 31 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
306 </component> 32 </component>
307 <component name="FileTemplateManagerImpl"> 33 <component name="FileTemplateManagerImpl">
308 <option name="RECENT_TEMPLATES"> 34 <option name="RECENT_TEMPLATES">
@@ -331,7 +57,6 @@ @@ -331,7 +57,6 @@
331 <component name="IdeDocumentHistory"> 57 <component name="IdeDocumentHistory">
332 <option name="CHANGED_PATHS"> 58 <option name="CHANGED_PATHS">
333 <list> 59 <list>
334 - <option value="$PROJECT_DIR$/application/common/library/Auth.php" />  
335 <option value="$PROJECT_DIR$/composer.json" /> 60 <option value="$PROJECT_DIR$/composer.json" />
336 <option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" /> 61 <option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
337 <option value="$PROJECT_DIR$/application/admin/view/vip/index.html" /> 62 <option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
@@ -347,29 +72,17 @@ @@ -347,29 +72,17 @@
347 <option value="$USER_HOME$/Desktop/1.html" /> 72 <option value="$USER_HOME$/Desktop/1.html" />
348 <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> 73 <option value="$PROJECT_DIR$/application/nsms/nsms.php" />
349 <option value="$PROJECT_DIR$/application/extra/verify.php" /> 74 <option value="$PROJECT_DIR$/application/extra/verify.php" />
350 - <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />  
351 - <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />  
352 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" /> 75 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
353 <option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" /> 76 <option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
354 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />  
355 - <option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />  
356 - <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />  
357 - <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />  
358 <option value="$PROJECT_DIR$/application/admin/view/pictype/add.html" /> 77 <option value="$PROJECT_DIR$/application/admin/view/pictype/add.html" />
359 <option value="$PROJECT_DIR$/application/admin/view/type/edit.html" /> 78 <option value="$PROJECT_DIR$/application/admin/view/type/edit.html" />
360 <option value="$PROJECT_DIR$/application/admin/view/pictype/edit.html" /> 79 <option value="$PROJECT_DIR$/application/admin/view/pictype/edit.html" />
361 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php" /> 80 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pictype.php" />
362 <option value="$PROJECT_DIR$/application/admin/model/Pictype.php" /> 81 <option value="$PROJECT_DIR$/application/admin/model/Pictype.php" />
363 <option value="$PROJECT_DIR$/public/assets/js/backend/pictype.js" /> 82 <option value="$PROJECT_DIR$/public/assets/js/backend/pictype.js" />
364 - <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />  
365 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> 83 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
366 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />  
367 - <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />  
368 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />  
369 - <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />  
370 <option value="$PROJECT_DIR$/runtime/log/201912/07.log" /> 84 <option value="$PROJECT_DIR$/runtime/log/201912/07.log" />
371 <option value="$PROJECT_DIR$/application/admin/view/accredit/add.html" /> 85 <option value="$PROJECT_DIR$/application/admin/view/accredit/add.html" />
372 - <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />  
373 <option value="$PROJECT_DIR$/application/admin/view/accredit/edit.html" /> 86 <option value="$PROJECT_DIR$/application/admin/view/accredit/edit.html" />
374 <option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" /> 87 <option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" />
375 <option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" /> 88 <option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" />
@@ -380,8 +93,21 @@ @@ -380,8 +93,21 @@
380 <option value="$PROJECT_DIR$/application/admin/view/order/shou.html" /> 93 <option value="$PROJECT_DIR$/application/admin/view/order/shou.html" />
381 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> 94 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
382 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> 95 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
383 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
384 <option value="$PROJECT_DIR$/application/api/controller/Common.php" /> 96 <option value="$PROJECT_DIR$/application/api/controller/Common.php" />
  97 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
  98 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
  99 + <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
  100 + <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
  101 + <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
  102 + <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
  103 + <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
  104 + <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
  105 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
  106 + <option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
  107 + <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
  108 + <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
  109 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
  110 + <option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
385 </list> 111 </list>
386 </option> 112 </option>
387 </component> 113 </component>
@@ -401,7 +127,7 @@ @@ -401,7 +127,7 @@
401 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 127 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
402 <component name="ProjectFrameBounds" extendedState="1"> 128 <component name="ProjectFrameBounds" extendedState="1">
403 <option name="x" value="263" /> 129 <option name="x" value="263" />
404 - <option name="y" value="61" /> 130 + <option name="y" value="95" />
405 <option name="width" value="1464" /> 131 <option name="width" value="1464" />
406 <option name="height" value="940" /> 132 <option name="height" value="940" />
407 </component> 133 </component>
@@ -420,8 +146,8 @@ @@ -420,8 +146,8 @@
420 <foldersAlwaysOnTop value="true" /> 146 <foldersAlwaysOnTop value="true" />
421 </navigator> 147 </navigator>
422 <panes> 148 <panes>
423 - <pane id="Scope" />  
424 <pane id="Scratches" /> 149 <pane id="Scratches" />
  150 + <pane id="Scope" />
425 <pane id="ProjectPane"> 151 <pane id="ProjectPane">
426 <subPane> 152 <subPane>
427 <expand> 153 <expand>
@@ -432,13 +158,35 @@ @@ -432,13 +158,35 @@
432 <path> 158 <path>
433 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 159 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
434 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 160 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
435 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 161 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  162 + </path>
  163 + <path>
  164 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  165 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  166 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  167 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  168 + </path>
  169 + <path>
  170 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  171 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  172 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  173 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  174 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
  175 + </path>
  176 + <path>
  177 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  178 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  179 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  180 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  181 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
436 </path> 182 </path>
437 <path> 183 <path>
438 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 184 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
439 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 185 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
440 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
441 - <item name="pdf" type="2a2b976b:PhpTreeStructureProvider$1" /> 186 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  187 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  188 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  189 + <item name="common" type="2a2b976b:PhpTreeStructureProvider$1" />
442 </path> 190 </path>
443 </expand> 191 </expand>
444 <select /> 192 <select />
@@ -448,7 +196,7 @@ @@ -448,7 +196,7 @@
448 </component> 196 </component>
449 <component name="PropertiesComponent"> 197 <component name="PropertiesComponent">
450 <property name="WebServerToolWindowFactoryState" value="false" /> 198 <property name="WebServerToolWindowFactoryState" value="false" />
451 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/micro" /> 199 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
452 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 200 <property name="DefaultHtmlFileTemplate" value="HTML File" />
453 </component> 201 </component>
454 <component name="RecentsManager"> 202 <component name="RecentsManager">
@@ -534,7 +282,8 @@ @@ -534,7 +282,8 @@
534 <workItem from="1575851041026" duration="14741000" /> 282 <workItem from="1575851041026" duration="14741000" />
535 <workItem from="1575874863361" duration="5705000" /> 283 <workItem from="1575874863361" duration="5705000" />
536 <workItem from="1575880737237" duration="12885000" /> 284 <workItem from="1575880737237" duration="12885000" />
537 - <workItem from="1575937244447" duration="5359000" /> 285 + <workItem from="1575937244447" duration="6285000" />
  286 + <workItem from="1575949803768" duration="4449000" />
538 </task> 287 </task>
539 <task id="LOCAL-00001" summary="调试"> 288 <task id="LOCAL-00001" summary="调试">
540 <created>1574145133364</created> 289 <created>1574145133364</created>
@@ -561,7 +310,7 @@ @@ -561,7 +310,7 @@
561 <servers /> 310 <servers />
562 </component> 311 </component>
563 <component name="TimeTrackingManager"> 312 <component name="TimeTrackingManager">
564 - <option name="totallyTimeSpent" value="379157000" /> 313 + <option name="totallyTimeSpent" value="384532000" />
565 </component> 314 </component>
566 <component name="TodoView"> 315 <component name="TodoView">
567 <todo-panel id="selected-file"> 316 <todo-panel id="selected-file">
@@ -573,19 +322,18 @@ @@ -573,19 +322,18 @@
573 </todo-panel> 322 </todo-panel>
574 </component> 323 </component>
575 <component name="ToolWindowManager"> 324 <component name="ToolWindowManager">
576 - <frame x="263" y="61" width="1464" height="940" extended-state="1" />  
577 - <editor active="true" /> 325 + <frame x="263" y="95" width="1464" height="940" extended-state="1" />
578 <layout> 326 <layout>
579 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22507122" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 327 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22792023" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
580 <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" /> 328 <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" />
581 <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" /> 329 <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" />
582 <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" /> 330 <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" />
583 - <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" />  
584 <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" /> 331 <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" />
  332 + <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" />
585 <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" /> 333 <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" />
586 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3601741" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 334 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3601741" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
587 - <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" />  
588 <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" /> 335 <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" />
  336 + <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" />
589 <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" /> 337 <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" />
590 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 338 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
591 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 339 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -626,109 +374,11 @@ @@ -626,109 +374,11 @@
626 </component> 374 </component>
627 <component name="XDebuggerManager"> 375 <component name="XDebuggerManager">
628 <breakpoint-manager> 376 <breakpoint-manager>
629 - <option name="time" value="21" /> 377 + <option name="time" value="22" />
630 </breakpoint-manager> 378 </breakpoint-manager>
631 <watches-manager /> 379 <watches-manager />
632 </component> 380 </component>
633 <component name="editorHistoryManager"> 381 <component name="editorHistoryManager">
634 - <entry file="file://$PROJECT_DIR$/application/admin/view/pictype/edit.html">  
635 - <provider selected="true" editor-type-id="text-editor">  
636 - <state relative-caret-position="525">  
637 - <caret line="21" column="10" lean-forward="false" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />  
638 - </state>  
639 - </provider>  
640 - </entry>  
641 - <entry file="file://$PROJECT_DIR$/thinkphp/library/think/model/relation/OneToOne.php">  
642 - <provider selected="true" editor-type-id="text-editor">  
643 - <state relative-caret-position="252">  
644 - <caret line="185" column="20" lean-forward="false" selection-start-line="185" selection-start-column="20" selection-end-line="185" selection-end-column="20" />  
645 - </state>  
646 - </provider>  
647 - </entry>  
648 - <entry file="file://$PROJECT_DIR$/application/admin/model/Pic.php">  
649 - <provider selected="true" editor-type-id="text-editor">  
650 - <state relative-caret-position="0">  
651 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
652 - </state>  
653 - </provider>  
654 - </entry>  
655 - <entry file="file://$PROJECT_DIR$/application/admin/model/Type.php">  
656 - <provider selected="true" editor-type-id="text-editor">  
657 - <state relative-caret-position="-27">  
658 - <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />  
659 - </state>  
660 - </provider>  
661 - </entry>  
662 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Type.php">  
663 - <provider selected="true" editor-type-id="text-editor">  
664 - <state relative-caret-position="-302">  
665 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
666 - </state>  
667 - </provider>  
668 - </entry>  
669 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pictype.php">  
670 - <provider selected="true" editor-type-id="text-editor">  
671 - <state relative-caret-position="548">  
672 - <caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />  
673 - </state>  
674 - </provider>  
675 - </entry>  
676 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pictype.js">  
677 - <provider selected="true" editor-type-id="text-editor">  
678 - <state relative-caret-position="375">  
679 - <caret line="24" column="21" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="24" selection-end-column="21" />  
680 - </state>  
681 - </provider>  
682 - </entry>  
683 - <entry file="file://$PROJECT_DIR$/application/admin/model/Pictype.php">  
684 - <provider selected="true" editor-type-id="text-editor">  
685 - <state relative-caret-position="413">  
686 - <caret line="28" column="6" lean-forward="true" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />  
687 - </state>  
688 - </provider>  
689 - </entry>  
690 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">  
691 - <provider selected="true" editor-type-id="text-editor">  
692 - <state relative-caret-position="475">  
693 - <caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />  
694 - </state>  
695 - </provider>  
696 - </entry>  
697 - <entry file="file://$PROJECT_DIR$/application/api/controller/Token.php">  
698 - <provider selected="true" editor-type-id="text-editor">  
699 - <state relative-caret-position="0">  
700 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
701 - </state>  
702 - </provider>  
703 - </entry>  
704 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">  
705 - <provider selected="true" editor-type-id="text-editor">  
706 - <state relative-caret-position="475">  
707 - <caret line="19" column="27" lean-forward="false" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />  
708 - </state>  
709 - </provider>  
710 - </entry>  
711 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">  
712 - <provider selected="true" editor-type-id="text-editor">  
713 - <state relative-caret-position="475">  
714 - <caret line="43" column="82" lean-forward="true" selection-start-line="43" selection-start-column="82" selection-end-line="43" selection-end-column="82" />  
715 - </state>  
716 - </provider>  
717 - </entry>  
718 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">  
719 - <provider selected="true" editor-type-id="text-editor">  
720 - <state relative-caret-position="600">  
721 - <caret line="24" column="27" lean-forward="false" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />  
722 - </state>  
723 - </provider>  
724 - </entry>  
725 - <entry file="file://$PROJECT_DIR$/runtime/log/201912/07.log">  
726 - <provider selected="true" editor-type-id="text-editor">  
727 - <state relative-caret-position="591">  
728 - <caret line="138" column="26" lean-forward="true" selection-start-line="138" selection-start-column="26" selection-end-line="138" selection-end-column="26" />  
729 - </state>  
730 - </provider>  
731 - </entry>  
732 <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> 382 <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
733 <provider selected="true" editor-type-id="text-editor"> 383 <provider selected="true" editor-type-id="text-editor">
734 <state relative-caret-position="375"> 384 <state relative-caret-position="375">
@@ -751,13 +401,6 @@ @@ -751,13 +401,6 @@
751 </state> 401 </state>
752 </provider> 402 </provider>
753 </entry> 403 </entry>
754 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">  
755 - <provider selected="true" editor-type-id="text-editor">  
756 - <state relative-caret-position="475">  
757 - <caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="45" />  
758 - </state>  
759 - </provider>  
760 - </entry>  
761 <entry file="file://$PROJECT_DIR$/public/admin.php"> 404 <entry file="file://$PROJECT_DIR$/public/admin.php">
762 <provider selected="true" editor-type-id="text-editor"> 405 <provider selected="true" editor-type-id="text-editor">
763 <state relative-caret-position="0"> 406 <state relative-caret-position="0">
@@ -765,13 +408,6 @@ @@ -765,13 +408,6 @@
765 </state> 408 </state>
766 </provider> 409 </provider>
767 </entry> 410 </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="175">  
771 - <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />  
772 - </state>  
773 - </provider>  
774 - </entry>  
775 <entry file="file://$PROJECT_DIR$/application/admin/view/accredit/edit.html"> 411 <entry file="file://$PROJECT_DIR$/application/admin/view/accredit/edit.html">
776 <provider selected="true" editor-type-id="text-editor"> 412 <provider selected="true" editor-type-id="text-editor">
777 <state relative-caret-position="375"> 413 <state relative-caret-position="375">
@@ -821,20 +457,6 @@ @@ -821,20 +457,6 @@
821 </state> 457 </state>
822 </provider> 458 </provider>
823 </entry> 459 </entry>
824 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">  
825 - <provider selected="true" editor-type-id="text-editor">  
826 - <state relative-caret-position="425">  
827 - <caret line="38" column="10" lean-forward="true" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />  
828 - </state>  
829 - </provider>  
830 - </entry>  
831 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
832 - <provider selected="true" editor-type-id="text-editor">  
833 - <state relative-caret-position="675">  
834 - <caret line="44" column="24" lean-forward="true" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="152" />  
835 - </state>  
836 - </provider>  
837 - </entry>  
838 <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml"> 460 <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
839 <provider selected="true" editor-type-id="text-editor"> 461 <provider selected="true" editor-type-id="text-editor">
840 <state relative-caret-position="0"> 462 <state relative-caret-position="0">
@@ -940,7 +562,6 @@ @@ -940,7 +562,6 @@
940 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
941 <state relative-caret-position="0"> 563 <state relative-caret-position="0">
942 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 564 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
943 - <folding />  
944 </state> 565 </state>
945 </provider> 566 </provider>
946 </entry> 567 </entry>
@@ -969,7 +590,6 @@ @@ -969,7 +590,6 @@
969 <provider selected="true" editor-type-id="text-editor"> 590 <provider selected="true" editor-type-id="text-editor">
970 <state relative-caret-position="191"> 591 <state relative-caret-position="191">
971 <caret line="10" column="16" lean-forward="false" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" /> 592 <caret line="10" column="16" lean-forward="false" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
972 - <folding />  
973 </state> 593 </state>
974 </provider> 594 </provider>
975 </entry> 595 </entry>
@@ -977,7 +597,6 @@ @@ -977,7 +597,6 @@
977 <provider selected="true" editor-type-id="text-editor"> 597 <provider selected="true" editor-type-id="text-editor">
978 <state relative-caret-position="1125"> 598 <state relative-caret-position="1125">
979 <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" /> 599 <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
980 - <folding />  
981 </state> 600 </state>
982 </provider> 601 </provider>
983 </entry> 602 </entry>
@@ -1192,100 +811,11 @@ @@ -1192,100 +811,11 @@
1192 </state> 811 </state>
1193 </provider> 812 </provider>
1194 </entry> 813 </entry>
1195 - <entry file="file://$PROJECT_DIR$/public/pdf/2019120751985353pdf">  
1196 - <provider selected="true" editor-type-id="text-editor">  
1197 - <state relative-caret-position="0">  
1198 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1199 - <folding />  
1200 - </state>  
1201 - </provider>  
1202 - </entry>  
1203 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">  
1204 - <provider selected="true" editor-type-id="text-editor">  
1205 - <state relative-caret-position="428">  
1206 - <caret line="1937" column="115" lean-forward="false" selection-start-line="1937" selection-start-column="115" selection-end-line="1937" selection-end-column="115" />  
1207 - <folding>  
1208 - <element signature="e#365#484#0#PHP" expanded="false" />  
1209 - <element signature="e#490#1228#0#PHP" expanded="false" />  
1210 - <element signature="e#1233#2896#0#PHP" expanded="false" />  
1211 - <element signature="e#1266#2890#0#PHP" expanded="false" />  
1212 - <element signature="e#2902#3430#0#PHP" expanded="false" />  
1213 - <element signature="e#3435#4571#0#PHP" expanded="false" />  
1214 - <element signature="e#4577#4984#0#PHP" expanded="false" />  
1215 - <element signature="e#4989#5332#0#PHP" expanded="false" />  
1216 - <element signature="e#5338#5751#0#PHP" expanded="false" />  
1217 - <element signature="e#5756#6104#0#PHP" expanded="false" />  
1218 - <element signature="e#6110#6947#0#PHP" expanded="false" />  
1219 - <element signature="e#6952#9147#0#PHP" expanded="false" />  
1220 - <element signature="e#9153#9833#0#PHP" expanded="false" />  
1221 - <element signature="e#9838#10691#0#PHP" expanded="false" />  
1222 - <element signature="e#10697#11486#0#PHP" expanded="false" />  
1223 - <element signature="e#11491#12839#0#PHP" expanded="false" />  
1224 - <element signature="e#12845#13547#0#PHP" expanded="false" />  
1225 - <element signature="e#13552#14752#0#PHP" expanded="false" />  
1226 - <element signature="e#14758#15334#0#PHP" expanded="false" />  
1227 - <element signature="e#15339#15900#0#PHP" expanded="false" />  
1228 - <element signature="e#15906#16622#0#PHP" expanded="false" />  
1229 - <element signature="e#16627#19053#0#PHP" expanded="false" />  
1230 - <element signature="e#19059#19961#0#PHP" expanded="false" />  
1231 - <element signature="e#19966#22792#0#PHP" expanded="false" />  
1232 - <element signature="e#22798#23175#0#PHP" expanded="false" />  
1233 - <element signature="e#23180#23501#0#PHP" expanded="false" />  
1234 - <element signature="e#23507#24012#0#PHP" expanded="false" />  
1235 - <element signature="e#24017#24268#0#PHP" expanded="false" />  
1236 - <element signature="e#24274#24753#0#PHP" expanded="false" />  
1237 - <element signature="e#24758#25515#0#PHP" expanded="false" />  
1238 - <element signature="e#25521#26002#0#PHP" expanded="false" />  
1239 - <element signature="e#26007#26777#0#PHP" expanded="false" />  
1240 - <element signature="e#26783#27146#0#PHP" expanded="false" />  
1241 - <element signature="e#27151#27342#0#PHP" expanded="false" />  
1242 - <element signature="e#27348#27706#0#PHP" expanded="false" />  
1243 - <element signature="e#27711#27902#0#PHP" expanded="false" />  
1244 - <element signature="e#27908#29051#0#PHP" expanded="false" />  
1245 - <element signature="e#29056#31721#0#PHP" expanded="false" />  
1246 - <element signature="e#31727#32225#0#PHP" expanded="false" />  
1247 - <element signature="e#32230#33976#0#PHP" expanded="false" />  
1248 - <element signature="e#33982#34395#0#PHP" expanded="false" />  
1249 - <element signature="e#34400#34879#0#PHP" expanded="false" />  
1250 - <element signature="e#34885#35419#0#PHP" expanded="false" />  
1251 - <element signature="e#35424#36809#0#PHP" expanded="false" />  
1252 - <element signature="e#36815#37469#0#PHP" expanded="false" />  
1253 - <element signature="e#37474#39489#0#PHP" expanded="false" />  
1254 - <element signature="e#39495#40255#0#PHP" expanded="false" />  
1255 - <element signature="e#40260#42969#0#PHP" expanded="false" />  
1256 - <element signature="e#42995#43826#0#PHP" expanded="false" />  
1257 - <element signature="e#43832#44252#0#PHP" expanded="false" />  
1258 - <element signature="e#44257#44740#0#PHP" expanded="false" />  
1259 - <element signature="e#44746#45552#0#PHP" expanded="false" />  
1260 - <element signature="e#45557#48715#0#PHP" expanded="false" />  
1261 - <element signature="e#48730#50065#0#PHP" expanded="false" />  
1262 - <element signature="e#50081#51115#0#PHP" expanded="false" />  
1263 - <element signature="e#51121#51879#0#PHP" expanded="false" />  
1264 - <element signature="e#51884#55627#0#PHP" expanded="false" />  
1265 - <element signature="e#55633#56025#0#PHP" expanded="false" />  
1266 - <element signature="e#56030#56982#0#PHP" expanded="false" />  
1267 - <element signature="e#57006#57579#0#PHP" expanded="false" />  
1268 - <element signature="e#57585#58184#0#PHP" expanded="false" />  
1269 - <element signature="e#58189#59116#0#PHP" expanded="false" />  
1270 - <element signature="e#59122#59836#0#PHP" expanded="false" />  
1271 - <element signature="e#59842#60269#0#PHP" expanded="false" />  
1272 - <element signature="e#60274#60743#0#PHP" expanded="false" />  
1273 - <element signature="e#60750#61955#0#PHP" expanded="false" />  
1274 - <element signature="e#61960#63663#0#PHP" expanded="false" />  
1275 - <element signature="e#62107#62446#1#PHP" expanded="false" />  
1276 - <element signature="e#62476#62830#1#PHP" expanded="false" />  
1277 - <element signature="e#63669#64535#0#PHP" expanded="false" />  
1278 - <element signature="e#64735#64872#1#PHP" expanded="false" />  
1279 - <element signature="e#64902#65042#1#PHP" expanded="false" />  
1280 - <element signature="e#65712#65796#0#PHP" expanded="false" />  
1281 - </folding>  
1282 - </state>  
1283 - </provider>  
1284 - </entry> 814 + <entry file="file://$PROJECT_DIR$/public/pdf/2019120751985353pdf" />
1285 <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> 815 <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
1286 <provider selected="true" editor-type-id="text-editor"> 816 <provider selected="true" editor-type-id="text-editor">
1287 - <state relative-caret-position="364">  
1288 - <caret line="152" column="39" lean-forward="true" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" /> 817 + <state relative-caret-position="703">
  818 + <caret line="179" column="5" lean-forward="false" selection-start-line="179" selection-start-column="5" selection-end-line="179" selection-end-column="5" />
1289 <folding> 819 <folding>
1290 <element signature="e#38#68#0#PHP" expanded="true" /> 820 <element signature="e#38#68#0#PHP" expanded="true" />
1291 <element signature="e#1222#1271#0#PHP" expanded="false" /> 821 <element signature="e#1222#1271#0#PHP" expanded="false" />
@@ -1485,5 +1015,237 @@ @@ -1485,5 +1015,237 @@
1485 </state> 1015 </state>
1486 </provider> 1016 </provider>
1487 </entry> 1017 </entry>
  1018 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
  1019 + <provider selected="true" editor-type-id="text-editor">
  1020 + <state relative-caret-position="50">
  1021 + <caret line="15" column="7" lean-forward="true" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
  1022 + <folding />
  1023 + </state>
  1024 + </provider>
  1025 + </entry>
  1026 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
  1027 + <provider selected="true" editor-type-id="text-editor">
  1028 + <state relative-caret-position="225">
  1029 + <caret line="9" column="4" lean-forward="false" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="33" />
  1030 + <folding />
  1031 + </state>
  1032 + </provider>
  1033 + </entry>
  1034 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
  1035 + <provider selected="true" editor-type-id="text-editor">
  1036 + <state relative-caret-position="400">
  1037 + <caret line="33" column="144" lean-forward="true" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="144" />
  1038 + <folding />
  1039 + </state>
  1040 + </provider>
  1041 + </entry>
  1042 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
  1043 + <provider selected="true" editor-type-id="text-editor">
  1044 + <state relative-caret-position="203">
  1045 + <caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="52" selection-end-column="10" />
  1046 + <folding>
  1047 + <element signature="n#div#4;n#form#0;n#!!top" expanded="false" />
  1048 + </folding>
  1049 + </state>
  1050 + </provider>
  1051 + </entry>
  1052 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
  1053 + <provider selected="true" editor-type-id="text-editor">
  1054 + <state relative-caret-position="200">
  1055 + <caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="14" />
  1056 + <folding />
  1057 + </state>
  1058 + </provider>
  1059 + </entry>
  1060 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
  1061 + <provider selected="true" editor-type-id="text-editor">
  1062 + <state relative-caret-position="169">
  1063 + <caret line="26" column="83" lean-forward="true" selection-start-line="26" selection-start-column="83" selection-end-line="26" selection-end-column="83" />
  1064 + <folding />
  1065 + </state>
  1066 + </provider>
  1067 + </entry>
  1068 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
  1069 + <provider selected="true" editor-type-id="text-editor">
  1070 + <state relative-caret-position="175">
  1071 + <caret line="7" column="29" lean-forward="true" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
  1072 + <folding />
  1073 + </state>
  1074 + </provider>
  1075 + </entry>
  1076 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  1077 + <provider selected="true" editor-type-id="text-editor">
  1078 + <state relative-caret-position="344">
  1079 + <caret line="39" column="4" lean-forward="false" selection-start-line="39" selection-start-column="4" selection-end-line="52" selection-end-column="10" />
  1080 + <folding />
  1081 + </state>
  1082 + </provider>
  1083 + </entry>
  1084 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
  1085 + <provider selected="true" editor-type-id="text-editor">
  1086 + <state relative-caret-position="225">
  1087 + <caret line="33" column="144" lean-forward="true" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="144" />
  1088 + <folding />
  1089 + </state>
  1090 + </provider>
  1091 + </entry>
  1092 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
  1093 + <provider selected="true" editor-type-id="text-editor">
  1094 + <state relative-caret-position="500">
  1095 + <caret line="32" column="144" lean-forward="false" selection-start-line="32" selection-start-column="144" selection-end-line="32" selection-end-column="144" />
  1096 + <folding />
  1097 + </state>
  1098 + </provider>
  1099 + </entry>
  1100 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
  1101 + <provider selected="true" editor-type-id="text-editor">
  1102 + <state relative-caret-position="-206">
  1103 + <caret line="20" column="71" lean-forward="false" selection-start-line="20" selection-start-column="71" selection-end-line="20" selection-end-column="71" />
  1104 + <folding />
  1105 + </state>
  1106 + </provider>
  1107 + </entry>
  1108 + <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
  1109 + <provider selected="true" editor-type-id="text-editor">
  1110 + <state relative-caret-position="819">
  1111 + <caret line="46" column="10" lean-forward="false" selection-start-line="46" selection-start-column="10" selection-end-line="46" selection-end-column="10" />
  1112 + <folding />
  1113 + </state>
  1114 + </provider>
  1115 + </entry>
  1116 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
  1117 + <provider selected="true" editor-type-id="text-editor">
  1118 + <state relative-caret-position="219">
  1119 + <caret line="39" column="4" lean-forward="false" selection-start-line="39" selection-start-column="4" selection-end-line="52" selection-end-column="10" />
  1120 + <folding>
  1121 + <element signature="n#div#4;n#form#0;n#!!top" expanded="false" />
  1122 + <element signature="n#div#6;n#form#0;n#!!top" expanded="false" />
  1123 + </folding>
  1124 + </state>
  1125 + </provider>
  1126 + </entry>
  1127 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  1128 + <provider selected="true" editor-type-id="text-editor">
  1129 + <state relative-caret-position="-320">
  1130 + <caret line="224" column="7" lean-forward="true" selection-start-line="224" selection-start-column="7" selection-end-line="224" selection-end-column="7" />
  1131 + <folding>
  1132 + <element signature="e#365#484#0#PHP" expanded="false" />
  1133 + <element signature="e#490#1228#0#PHP" expanded="false" />
  1134 + <element signature="e#1233#2896#0#PHP" expanded="false" />
  1135 + <element signature="e#1266#2890#0#PHP" expanded="false" />
  1136 + <element signature="e#2902#3430#0#PHP" expanded="false" />
  1137 + <element signature="e#3435#4571#0#PHP" expanded="false" />
  1138 + <element signature="e#4577#4984#0#PHP" expanded="false" />
  1139 + <element signature="e#4989#5332#0#PHP" expanded="false" />
  1140 + <element signature="e#5338#5751#0#PHP" expanded="false" />
  1141 + <element signature="e#5756#6104#0#PHP" expanded="false" />
  1142 + <element signature="e#6110#6947#0#PHP" expanded="false" />
  1143 + <element signature="e#6952#9147#0#PHP" expanded="false" />
  1144 + <element signature="e#9153#9833#0#PHP" expanded="false" />
  1145 + <element signature="e#9838#10746#0#PHP" expanded="false" />
  1146 + <element signature="e#10752#11541#0#PHP" expanded="false" />
  1147 + <element signature="e#11546#12894#0#PHP" expanded="false" />
  1148 + <element signature="e#12900#13602#0#PHP" expanded="false" />
  1149 + <element signature="e#13607#14917#0#PHP" expanded="false" />
  1150 + <element signature="e#14923#15499#0#PHP" expanded="false" />
  1151 + <element signature="e#15504#16116#0#PHP" expanded="false" />
  1152 + <element signature="e#16122#16838#0#PHP" expanded="false" />
  1153 + <element signature="e#16843#19383#0#PHP" expanded="false" />
  1154 + <element signature="e#19389#20291#0#PHP" expanded="false" />
  1155 + <element signature="e#20296#23236#0#PHP" expanded="false" />
  1156 + <element signature="e#23242#23619#0#PHP" expanded="false" />
  1157 + <element signature="e#23624#23945#0#PHP" expanded="false" />
  1158 + <element signature="e#23951#24456#0#PHP" expanded="false" />
  1159 + <element signature="e#24461#24712#0#PHP" expanded="false" />
  1160 + <element signature="e#24718#25197#0#PHP" expanded="false" />
  1161 + <element signature="e#25202#25959#0#PHP" expanded="false" />
  1162 + <element signature="e#25965#26446#0#PHP" expanded="false" />
  1163 + <element signature="e#26451#27221#0#PHP" expanded="false" />
  1164 + <element signature="e#27227#27590#0#PHP" expanded="false" />
  1165 + <element signature="e#27595#27786#0#PHP" expanded="false" />
  1166 + <element signature="e#27792#28150#0#PHP" expanded="false" />
  1167 + <element signature="e#28155#28346#0#PHP" expanded="false" />
  1168 + <element signature="e#28352#29495#0#PHP" expanded="false" />
  1169 + <element signature="e#29500#32165#0#PHP" expanded="false" />
  1170 + <element signature="e#32171#32669#0#PHP" expanded="false" />
  1171 + <element signature="e#32674#34420#0#PHP" expanded="false" />
  1172 + <element signature="e#34426#34839#0#PHP" expanded="false" />
  1173 + <element signature="e#34844#35323#0#PHP" expanded="false" />
  1174 + <element signature="e#35329#35863#0#PHP" expanded="false" />
  1175 + <element signature="e#35868#37253#0#PHP" expanded="false" />
  1176 + <element signature="e#37259#37913#0#PHP" expanded="false" />
  1177 + <element signature="e#37918#39933#0#PHP" expanded="false" />
  1178 + <element signature="e#39939#40699#0#PHP" expanded="false" />
  1179 + <element signature="e#40704#43413#0#PHP" expanded="false" />
  1180 + <element signature="e#43439#44270#0#PHP" expanded="false" />
  1181 + <element signature="e#44276#44696#0#PHP" expanded="false" />
  1182 + <element signature="e#44701#45184#0#PHP" expanded="false" />
  1183 + <element signature="e#45190#45996#0#PHP" expanded="false" />
  1184 + <element signature="e#46001#49159#0#PHP" expanded="false" />
  1185 + <element signature="e#49174#50509#0#PHP" expanded="false" />
  1186 + <element signature="e#50525#51559#0#PHP" expanded="false" />
  1187 + <element signature="e#51565#52323#0#PHP" expanded="false" />
  1188 + <element signature="e#52328#56071#0#PHP" expanded="false" />
  1189 + <element signature="e#56077#56469#0#PHP" expanded="false" />
  1190 + <element signature="e#56474#57426#0#PHP" expanded="false" />
  1191 + <element signature="e#57450#58023#0#PHP" expanded="false" />
  1192 + <element signature="e#58029#58628#0#PHP" expanded="false" />
  1193 + <element signature="e#58633#59560#0#PHP" expanded="false" />
  1194 + <element signature="e#59566#60280#0#PHP" expanded="false" />
  1195 + <element signature="e#60286#60713#0#PHP" expanded="false" />
  1196 + <element signature="e#60718#61187#0#PHP" expanded="false" />
  1197 + <element signature="e#61194#62399#0#PHP" expanded="false" />
  1198 + <element signature="e#62404#64107#0#PHP" expanded="false" />
  1199 + <element signature="e#62551#62890#1#PHP" expanded="false" />
  1200 + <element signature="e#62920#63274#1#PHP" expanded="false" />
  1201 + <element signature="e#64113#64979#0#PHP" expanded="false" />
  1202 + <element signature="e#64984#67519#0#PHP" expanded="false" />
  1203 + <element signature="e#65179#65316#1#PHP" expanded="false" />
  1204 + <element signature="e#65346#65486#1#PHP" expanded="false" />
  1205 + <element signature="e#66156#66240#0#PHP" expanded="false" />
  1206 + </folding>
  1207 + </state>
  1208 + </provider>
  1209 + </entry>
  1210 + <entry file="file://$PROJECT_DIR$/application/admin/view/index/login.html">
  1211 + <provider selected="true" editor-type-id="text-editor">
  1212 + <state relative-caret-position="0">
  1213 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1214 + <folding />
  1215 + </state>
  1216 + </provider>
  1217 + </entry>
  1218 + <entry file="file://$PROJECT_DIR$/application/admin/view/index/index.html">
  1219 + <provider selected="true" editor-type-id="text-editor">
  1220 + <state relative-caret-position="0">
  1221 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1222 + <folding />
  1223 + </state>
  1224 + </provider>
  1225 + </entry>
  1226 + <entry file="file://$PROJECT_DIR$/application/admin/view/command/index.html">
  1227 + <provider selected="true" editor-type-id="text-editor">
  1228 + <state relative-caret-position="0">
  1229 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1230 + <folding />
  1231 + </state>
  1232 + </provider>
  1233 + </entry>
  1234 + <entry file="file://$PROJECT_DIR$/application/admin/view/common/menu.html">
  1235 + <provider selected="true" editor-type-id="text-editor">
  1236 + <state relative-caret-position="394">
  1237 + <caret line="27" column="38" lean-forward="true" selection-start-line="27" selection-start-column="38" selection-end-line="27" selection-end-column="38" />
  1238 + <folding />
  1239 + </state>
  1240 + </provider>
  1241 + </entry>
  1242 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Index.php">
  1243 + <provider selected="true" editor-type-id="text-editor">
  1244 + <state relative-caret-position="-225">
  1245 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1246 + <folding />
  1247 + </state>
  1248 + </provider>
  1249 + </entry>
1488 </component> 1250 </component>
1489 </project> 1251 </project>
@@ -7,6 +7,7 @@ return [ @@ -7,6 +7,7 @@ return [
7 'Number' =>'编号', 7 'Number' =>'编号',
8 'Keyword' => '关键词（多个关键词中间用逗号隔开）', 8 'Keyword' => '关键词（多个关键词中间用逗号隔开）',
9 'Thumbnail' => '缩略图', 9 'Thumbnail' => '缩略图',
  10 + 'Share' =>'分享到小程序的封面',
10 'Type_ids' => '地区标签', 11 'Type_ids' => '地区标签',
11 'Pictype_ids' => '图片类型', 12 'Pictype_ids' => '图片类型',
12 'Water_url' => '带水印的小样图片', 13 'Water_url' => '带水印的小样图片',
@@ -7,6 +7,7 @@ return [ @@ -7,6 +7,7 @@ return [
7 'Is_top' =>'是否置顶', 7 'Is_top' =>'是否置顶',
8 'Keyword' => '关键词', 8 'Keyword' => '关键词',
9 'Thumbnail' => '视频封面图', 9 'Thumbnail' => '视频封面图',
  10 + 'Share' =>'分享到小程序的封面',
10 'Type_ids' => '地区标签', 11 'Type_ids' => '地区标签',
11 'Video' => '2K视频', 12 'Video' => '2K视频',
12 'Water_url' => '带水印云盘地址', 13 'Water_url' => '带水印云盘地址',
@@ -5,6 +5,7 @@ return [ @@ -5,6 +5,7 @@ return [
5 'Thumbnail' => '视频封面', 5 'Thumbnail' => '视频封面',
6 'Number' =>'编号', 6 'Number' =>'编号',
7 'Video' => '视频', 7 'Video' => '视频',
  8 + 'Share' =>'分享图',
8 'Is_show' => '首页展示权重', 9 'Is_show' => '首页展示权重',
9 'Is_top' => '是否置顶', 10 'Is_top' => '是否置顶',
10 'Content' =>'简介', 11 'Content' =>'简介',
@@ -36,9 +36,9 @@ @@ -36,9 +36,9 @@
36 {$menulist} 36 {$menulist}
37 37
38 <!--以下4行可以删除或改成自己的链接,但建议你在你的网站上添加一个FastAdmin的链接--> 38 <!--以下4行可以删除或改成自己的链接,但建议你在你的网站上添加一个FastAdmin的链接-->
39 - <li class="header" data-rel="external">{:__('Links')}</li>  
40 - <li data-rel="external"><a href="https://doc.fastadmin.net" target="_blank"><i class="fa fa-list text-red"></i> <span>{:__('Docs')}</span></a></li>  
41 - <li data-rel="external"><a href="https://forum.fastadmin.net" target="_blank"><i class="fa fa-comment text-yellow"></i> <span>{:__('Forum')}</span></a></li>  
42 - <li data-rel="external"><a href="https://jq.qq.com/?_wv=1027&k=487PNBb" target="_blank"><i class="fa fa-qq text-aqua"></i> <span>{:__('QQ qun')}</span></a></li> 39 + <!--<li class="header" data-rel="external">{:__('Links')}</li>-->
  40 + <!--<li data-rel="external"><a href="https://doc.fastadmin.net" target="_blank"><i class="fa fa-list text-red"></i> <span>{:__('Docs')}</span></a></li>-->
  41 + <!--<li data-rel="external"><a href="https://forum.fastadmin.net" target="_blank"><i class="fa fa-comment text-yellow"></i> <span>{:__('Forum')}</span></a></li>-->
  42 + <!--<li data-rel="external"><a href="https://jq.qq.com/?_wv=1027&k=487PNBb" target="_blank"><i class="fa fa-qq text-aqua"></i> <span>{:__('QQ qun')}</span></a></li>-->
43 </ul> 43 </ul>
44 </section> 44 </section>
@@ -38,6 +38,20 @@ @@ -38,6 +38,20 @@
38 </div> 38 </div>
39 </div> 39 </div>
40 <div class="form-group"> 40 <div class="form-group">
  41 + <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
  42 + <div class="col-xs-12 col-sm-8">
  43 + <div class="input-group">
  44 + <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" placeholder="请上传图片(400px*400px)">
  45 + <div class="input-group-addon no-border no-padding">
  46 + <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  47 + <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  48 + </div>
  49 + <span class="msg-box n-right"></span>
  50 + </div>
  51 + <ul class="row list-inline plupload-preview" id="p-share"></ul>
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
41 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label> 55 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
42 <div class="col-xs-12 col-sm-8"> 56 <div class="col-xs-12 col-sm-8">
43 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value=""> 57 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="">
@@ -38,6 +38,20 @@ @@ -38,6 +38,20 @@
38 </div> 38 </div>
39 </div> 39 </div>
40 <div class="form-group"> 40 <div class="form-group">
  41 + <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
  42 + <div class="col-xs-12 col-sm-8">
  43 + <div class="input-group">
  44 + <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" value="{$row.share}" placeholder="请上传图片(400px*400px)">
  45 + <div class="input-group-addon no-border no-padding">
  46 + <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  47 + <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  48 + </div>
  49 + <span class="msg-box n-right"></span>
  50 + </div>
  51 + <ul class="row list-inline plupload-preview" id="p-share"></ul>
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
41 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label> 55 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
42 <div class="col-xs-12 col-sm-8"> 56 <div class="col-xs-12 col-sm-8">
43 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}"> 57 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}">
@@ -38,6 +38,20 @@ @@ -38,6 +38,20 @@
38 </div> 38 </div>
39 </div> 39 </div>
40 <div class="form-group"> 40 <div class="form-group">
  41 + <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
  42 + <div class="col-xs-12 col-sm-8">
  43 + <div class="input-group">
  44 + <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" placeholder="请上传图片(400px*400px)">
  45 + <div class="input-group-addon no-border no-padding">
  46 + <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  47 + <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  48 + </div>
  49 + <span class="msg-box n-right"></span>
  50 + </div>
  51 + <ul class="row list-inline plupload-preview" id="p-share"></ul>
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
41 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label> 55 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
42 <div class="col-xs-12 col-sm-8"> 56 <div class="col-xs-12 col-sm-8">
43 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value=""> 57 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="">
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 </div> 24 </div>
25 </div> 25 </div>
26 <div class="form-group"> 26 <div class="form-group">
27 - <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label> 27 + <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
28 <div class="col-xs-12 col-sm-8"> 28 <div class="col-xs-12 col-sm-8">
29 <div class="input-group"> 29 <div class="input-group">
30 <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传视频封面"> 30 <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传视频封面">
@@ -38,6 +38,20 @@ @@ -38,6 +38,20 @@
38 </div> 38 </div>
39 </div> 39 </div>
40 <div class="form-group"> 40 <div class="form-group">
  41 + <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
  42 + <div class="col-xs-12 col-sm-8">
  43 + <div class="input-group">
  44 + <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" value="{$row.share}" placeholder="请上传图片(400px*400px)">
  45 + <div class="input-group-addon no-border no-padding">
  46 + <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  47 + <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  48 + </div>
  49 + <span class="msg-box n-right"></span>
  50 + </div>
  51 + <ul class="row list-inline plupload-preview" id="p-share"></ul>
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
41 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label> 55 <label class="control-label col-xs-12 col-sm-2">{:__('Type_ids')}:</label>
42 <div class="col-xs-12 col-sm-8"> 56 <div class="col-xs-12 col-sm-8">
43 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}"> 57 <input id="c-type_ids" data-rule="required" data-source="type/index" data-multiple="true" data-field="area_name" class="form-control selectpage" name="row[type_ids]" type="text" value="{$row.type_ids}">
@@ -32,6 +32,20 @@ @@ -32,6 +32,20 @@
32 </div> 32 </div>
33 </div> 33 </div>
34 <div class="form-group"> 34 <div class="form-group">
  35 + <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
  36 + <div class="col-xs-12 col-sm-8">
  37 + <div class="input-group">
  38 + <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" placeholder="请上传图片(400px*400px)">
  39 + <div class="input-group-addon no-border no-padding">
  40 + <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  41 + <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  42 + </div>
  43 + <span class="msg-box n-right"></span>
  44 + </div>
  45 + <ul class="row list-inline plupload-preview" id="p-share"></ul>
  46 + </div>
  47 + </div>
  48 + <div class="form-group">
35 <label for="c-avatar" class="control-label col-xs-12 col-sm-2">2k视频上传</label> 49 <label for="c-avatar" class="control-label col-xs-12 col-sm-2">2k视频上传</label>
36 <div class="col-xs-12 col-sm-8"> 50 <div class="col-xs-12 col-sm-8">
37 <div class="input-group"> 51 <div class="input-group">
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="form-group"> 20 <div class="form-group">
21 - <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label> 21 + <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
22 <div class="col-xs-12 col-sm-8"> 22 <div class="col-xs-12 col-sm-8">
23 <div class="input-group"> 23 <div class="input-group">
24 <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传视频封面"> 24 <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传视频封面">
@@ -32,6 +32,20 @@ @@ -32,6 +32,20 @@
32 </div> 32 </div>
33 </div> 33 </div>
34 <div class="form-group"> 34 <div class="form-group">
  35 + <label class="control-label col-xs-12 col-sm-2">{:__('Share')}:</label>
  36 + <div class="col-xs-12 col-sm-8">
  37 + <div class="input-group">
  38 + <input id="c-share" data-rule="required" class="form-control" size="35" name="row[share]" type="text" value="{$row.share}" placeholder="请上传图片(400px*400px)">
  39 + <div class="input-group-addon no-border no-padding">
  40 + <span><button type="button" id="plupload-share" class="btn btn-danger plupload" data-input-id="c-share" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-share"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
  41 + <span><button type="button" id="fachoose-share" class="btn btn-primary fachoose" data-input-id="c-share" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
  42 + </div>
  43 + <span class="msg-box n-right"></span>
  44 + </div>
  45 + <ul class="row list-inline plupload-preview" id="p-share"></ul>
  46 + </div>
  47 + </div>
  48 + <div class="form-group">
35 <label for="c-avatar" class="control-label col-xs-12 col-sm-2">视频上传</label> 49 <label for="c-avatar" class="control-label col-xs-12 col-sm-2">视频上传</label>
36 <div class="col-xs-12 col-sm-8"> 50 <div class="col-xs-12 col-sm-8">
37 <div class="input-group"> 51 <div class="input-group">
@@ -314,12 +314,13 @@ class User extends Api @@ -314,12 +314,13 @@ class User extends Api
314 $pictype_id = ','.$pictype_id.','; 314 $pictype_id = ','.$pictype_id.',';
315 $where['pictype_ids'] = ['like',"%$pictype_id%"]; 315 $where['pictype_ids'] = ['like',"%$pictype_id%"];
316 $data = Db::name('pic') 316 $data = Db::name('pic')
317 - ->field('id,thumbnail,title') 317 + ->field('id,thumbnail,title,share')
318 ->where($where) 318 ->where($where)
319 ->order('id desc') 319 ->order('id desc')
320 ->page($page, $pageNum) 320 ->page($page, $pageNum)
321 ->select(); 321 ->select();
322 foreach ($data as &$v) { 322 foreach ($data as &$v) {
  323 + $v['share'] = $rule.$v['share'];
323 $v['thumbnail'] = $rule . $v['thumbnail']; 324 $v['thumbnail'] = $rule . $v['thumbnail'];
324 } 325 }
325 $this->success('SUCCESS', $data); 326 $this->success('SUCCESS', $data);
@@ -413,11 +414,12 @@ class User extends Api @@ -413,11 +414,12 @@ class User extends Api
413 $type_id = $this->request->post('type_id'); 414 $type_id = $this->request->post('type_id');
414 if(empty($type_id)){ 415 if(empty($type_id)){
415 $data = Db::name('video') 416 $data = Db::name('video')
416 - ->field('id,thumbnail,video') 417 + ->field('id,thumbnail,video,share')
417 ->order('id desc') 418 ->order('id desc')
418 ->page($page,$pageNum) 419 ->page($page,$pageNum)
419 ->select(); 420 ->select();
420 foreach ($data as &$v){ 421 foreach ($data as &$v){
  422 + $v['share'] = $rule.$v['share'];
421 $v['thumbnail'] = $rule.$v['thumbnail']; 423 $v['thumbnail'] = $rule.$v['thumbnail'];
422 $v['video'] = $rule.$v['video']; 424 $v['video'] = $rule.$v['video'];
423 } 425 }
@@ -427,11 +429,12 @@ class User extends Api @@ -427,11 +429,12 @@ class User extends Api
427 $where['type_ids'] = ['like',"%$type%"]; 429 $where['type_ids'] = ['like',"%$type%"];
428 $data = Db::name('video') 430 $data = Db::name('video')
429 ->where($where) 431 ->where($where)
430 - ->field('id,thumbnail,video') 432 + ->field('id,thumbnail,video,share')
431 ->order('id desc') 433 ->order('id desc')
432 ->page($page,$pageNum) 434 ->page($page,$pageNum)
433 ->select(); 435 ->select();
434 foreach ($data as &$v){ 436 foreach ($data as &$v){
  437 + $v['share'] = $rule.$v['share'];
435 $v['thumbnail'] = $rule.$v['thumbnail']; 438 $v['thumbnail'] = $rule.$v['thumbnail'];
436 $v['video'] = $rule.$v['video']; 439 $v['video'] = $rule.$v['video'];
437 } 440 }
@@ -465,12 +468,13 @@ class User extends Api @@ -465,12 +468,13 @@ class User extends Api
465 $page = $this->request->param('page',1,'intval'); 468 $page = $this->request->param('page',1,'intval');
466 $pageNum = $this->request->param('pageNum',10,'intval'); 469 $pageNum = $this->request->param('pageNum',10,'intval');
467 $data = Db::name('wonderful') 470 $data = Db::name('wonderful')
468 - ->field('id,thumbnail,video,title,content') 471 + ->field('id,thumbnail,video,title,content,share')
469 ->order('id desc') 472 ->order('id desc')
470 ->page($page,$pageNum) 473 ->page($page,$pageNum)
471 ->select(); 474 ->select();
472 foreach ($data as &$v){ 475 foreach ($data as &$v){
473 $v['thumbnail'] = $rule.$v['thumbnail']; 476 $v['thumbnail'] = $rule.$v['thumbnail'];
  477 + $v['share'] = $rule.$v['share'];
474 $v['video'] = $rule.$v['video']; 478 $v['video'] = $rule.$v['video'];
475 } 479 }
476 $this->success('SUCCESS',$data); 480 $this->success('SUCCESS',$data);
@@ -520,7 +524,7 @@ class User extends Api @@ -520,7 +524,7 @@ class User extends Api
520 ->where('id',1) 524 ->where('id',1)
521 ->find(); 525 ->find();
522 $data = Db::name('pic') 526 $data = Db::name('pic')
523 - ->field('id,title,thumbnail,price,water_url,url,code,content,click_num') 527 + ->field('id,title,thumbnail,price,water_url,url,code,content,click_num,share')
524 ->where('id',$pic_id) 528 ->where('id',$pic_id)
525 ->find(); 529 ->find();
526 if(empty($data)){ 530 if(empty($data)){
@@ -532,6 +536,7 @@ class User extends Api @@ -532,6 +536,7 @@ class User extends Api
532 $data['water_url'] = $rule.$data['water_url']; 536 $data['water_url'] = $rule.$data['water_url'];
533 $data['vip_price'] = $data['price'] * 0.75; 537 $data['vip_price'] = $data['price'] * 0.75;
534 $data['thumbnail'] = $rule.$data['thumbnail']; 538 $data['thumbnail'] = $rule.$data['thumbnail'];
  539 + $data['share'] = $rule.$data['share'];
535 $data['content'] = strip_tags($data['content']); 540 $data['content'] = strip_tags($data['content']);
536 $data['is_vip'] = 0; 541 $data['is_vip'] = 0;
537 $this->success('SUCCESS',$data); 542 $this->success('SUCCESS',$data);
@@ -541,7 +546,7 @@ class User extends Api @@ -541,7 +546,7 @@ class User extends Api
541 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 546 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
542 } 547 }
543 $data = Db::name('pic') 548 $data = Db::name('pic')
544 - ->field('id,title,thumbnail,price,water_url,url,code,content,click_num') 549 + ->field('id,title,thumbnail,price,water_url,url,code,content,click_num,share')
545 ->where('id',$pic_id) 550 ->where('id',$pic_id)
546 ->find(); 551 ->find();
547 $accredit = Db::name('accredit') 552 $accredit = Db::name('accredit')
@@ -557,6 +562,7 @@ class User extends Api @@ -557,6 +562,7 @@ class User extends Api
557 $data['water_url'] = $rule.$data['water_url']; 562 $data['water_url'] = $rule.$data['water_url'];
558 $data['vip_price'] = $data['price'] * 0.75; 563 $data['vip_price'] = $data['price'] * 0.75;
559 $data['thumbnail'] = $rule.$data['thumbnail']; 564 $data['thumbnail'] = $rule.$data['thumbnail'];
  565 + $data['share'] = $rule.$data['share'];
560 $data['content'] = strip_tags($data['content']); 566 $data['content'] = strip_tags($data['content']);
561 $this->success('SUCCESS',$data); 567 $this->success('SUCCESS',$data);
562 } 568 }
@@ -606,7 +612,7 @@ class User extends Api @@ -606,7 +612,7 @@ class User extends Api
606 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 612 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
607 } 613 }
608 $data = Db::name('video') 614 $data = Db::name('video')
609 - ->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') 615 + ->field('share,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')
610 ->where('id',$pic_id) 616 ->where('id',$pic_id)
611 ->find(); 617 ->find();
612 if(empty($data)){ 618 if(empty($data)){
@@ -622,6 +628,7 @@ class User extends Api @@ -622,6 +628,7 @@ class User extends Api
622 $data['four_vipprice'] = $data['four_price']*0.75; 628 $data['four_vipprice'] = $data['four_price']*0.75;
623 $data['eight_vipprice'] = $data['eight_price']*0.75; 629 $data['eight_vipprice'] = $data['eight_price']*0.75;
624 $data['thumbnail'] = $rule.$data['thumbnail']; 630 $data['thumbnail'] = $rule.$data['thumbnail'];
  631 + $data['share'] = $rule.$data['share'];
625 $data['video'] = $rule.$data['video']; 632 $data['video'] = $rule.$data['video'];
626 $data['content'] = strip_tags($data['content']); 633 $data['content'] = strip_tags($data['content']);
627 $data['is_vip'] = 0; 634 $data['is_vip'] = 0;
@@ -632,7 +639,7 @@ class User extends Api @@ -632,7 +639,7 @@ class User extends Api
632 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 639 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
633 } 640 }
634 $data = Db::name('video') 641 $data = Db::name('video')
635 - ->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') 642 + ->field('share,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')
636 ->where('id',$pic_id) 643 ->where('id',$pic_id)
637 ->find(); 644 ->find();
638 if(empty($data)){ 645 if(empty($data)){
@@ -649,6 +656,7 @@ class User extends Api @@ -649,6 +656,7 @@ class User extends Api
649 $data['four_vipprice'] = $data['four_price']*0.75; 656 $data['four_vipprice'] = $data['four_price']*0.75;
650 $data['eight_vipprice'] = $data['eight_price']*0.75; 657 $data['eight_vipprice'] = $data['eight_price']*0.75;
651 $data['thumbnail'] = $rule.$data['thumbnail']; 658 $data['thumbnail'] = $rule.$data['thumbnail'];
  659 + $data['share'] = $rule.$data['share'];
652 $data['video'] = $rule.$data['video']; 660 $data['video'] = $rule.$data['video'];
653 $data['content'] = strip_tags($data['content']); 661 $data['content'] = strip_tags($data['content']);
654 $this->success('SUCCESS',$data); 662 $this->success('SUCCESS',$data);
@@ -7133,7 +7133,7 @@ @@ -7133,7 +7133,7 @@
7133 7133
7134 <div class="row mt0 footer"> 7134 <div class="row mt0 footer">
7135 <div class="col-md-6" align="left"> 7135 <div class="col-md-6" align="left">
7136 - Generated on 2019-12-09 19:48:11 </div> 7136 + Generated on 2019-12-10 13:19:28 </div>
7137 <div class="col-md-6" align="right"> 7137 <div class="col-md-6" align="right">
7138 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 7138 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
7139 </div> 7139 </div>
@@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
31 {field: 'title', title: __('Title'),operate:false}, 31 {field: 'title', title: __('Title'),operate:false},
32 {field: 'keyword', title: __('Keyword'),operate:false}, 32 {field: 'keyword', title: __('Keyword'),operate:false},
33 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 33 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
  34 + {field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
34 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')}, 35 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
35 {field: 'pictype_ids', title: __('Pictype_ids'),searchList:$.getJSON('pic/pictype')}, 36 {field: 'pictype_ids', title: __('Pictype_ids'),searchList:$.getJSON('pic/pictype')},
36 {field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 37 {field: 'water_url', title: __('Water_url'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
@@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
31 {field: 'title', title: __('Title'),operate:false}, 31 {field: 'title', title: __('Title'),operate:false},
32 {field: 'keyword', title: __('Keyword'),operate:false}, 32 {field: 'keyword', title: __('Keyword'),operate:false},
33 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image}, 33 {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
  34 + {field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
34 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('video/type')}, 35 {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('video/type')},
35 {field: 'water_url', title: __('Water_url'),operate:false, formatter: Table.api.formatter.url}, 36 {field: 'water_url', title: __('Water_url'),operate:false, formatter: Table.api.formatter.url},
36 {field: 'two_url', title: __('Two_url'),operate:false, formatter: Table.api.formatter.url}, 37 {field: 'two_url', title: __('Two_url'),operate:false, formatter: Table.api.formatter.url},
@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
30 {field: 'is_show', title: __('Is_show'),operate:false}, 30 {field: 'is_show', title: __('Is_show'),operate:false},
31 {field: 'title', title: __('Title'),operate:false}, 31 {field: 'title', title: __('Title'),operate:false},
32 {field: 'thumbnail', title: __('Thumbnail'),operate:false,formatter: Table.api.formatter.image}, 32 {field: 'thumbnail', title: __('Thumbnail'),operate:false,formatter: Table.api.formatter.image},
  33 + {field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
33 {field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}}, 34 {field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
34 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 35 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
35 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 36 {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},