郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 a8fe5fe3b1224684b29ea07ded0eaba480a18e06 1 个父辈 49eb26ff
1 个管道 的构建 通过 耗费 4 秒

会员须知

内嵌 并排对比
正在显示 4 个修改的文件 包含 174 行增加 和 147 行删除
@@ -2,7 +2,10 @@ @@ -2,7 +2,10 @@
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/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
6 </list> 9 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -13,11 +16,11 @@ @@ -13,11 +16,11 @@
13 </component> 16 </component>
14 <component name="FileEditorManager"> 17 <component name="FileEditorManager">
15 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 18 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
16 - <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> 19 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
17 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 20 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
18 <provider selected="true" editor-type-id="text-editor"> 21 <provider selected="true" editor-type-id="text-editor">
19 - <state relative-caret-position="275">  
20 - <caret line="17" column="26" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="26" /> 22 + <state relative-caret-position="378">
  23 + <caret line="785" column="7" lean-forward="true" selection-start-line="785" selection-start-column="7" selection-end-line="785" selection-end-column="7" />
21 <folding> 24 <folding>
22 <element signature="e#365#484#0#PHP" expanded="false" /> 25 <element signature="e#365#484#0#PHP" expanded="false" />
23 <element signature="e#490#1228#0#PHP" expanded="false" /> 26 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -49,8 +52,8 @@ @@ -49,8 +52,8 @@
49 <element signature="e#23830#24311#0#PHP" expanded="false" /> 52 <element signature="e#23830#24311#0#PHP" expanded="false" />
50 <element signature="e#24316#25086#0#PHP" expanded="false" /> 53 <element signature="e#24316#25086#0#PHP" expanded="false" />
51 <element signature="e#25092#25455#0#PHP" expanded="false" /> 54 <element signature="e#25092#25455#0#PHP" expanded="false" />
52 - <element signature="e#25460#25651#0#PHP" expanded="false" />  
53 <element signature="e#25657#26015#0#PHP" expanded="false" /> 55 <element signature="e#25657#26015#0#PHP" expanded="false" />
  56 + <element signature="e#26020#26211#0#PHP" expanded="false" />
54 <element signature="e#26217#27360#0#PHP" expanded="false" /> 57 <element signature="e#26217#27360#0#PHP" expanded="false" />
55 <element signature="e#27365#30030#0#PHP" expanded="false" /> 58 <element signature="e#27365#30030#0#PHP" expanded="false" />
56 <element signature="e#30036#30534#0#PHP" expanded="false" /> 59 <element signature="e#30036#30534#0#PHP" expanded="false" />
@@ -87,45 +90,22 @@ @@ -87,45 +90,22 @@
87 </provider> 90 </provider>
88 </entry> 91 </entry>
89 </file> 92 </file>
90 - <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">  
91 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 93 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
92 <provider selected="true" editor-type-id="text-editor"> 95 <provider selected="true" editor-type-id="text-editor">
93 - <state relative-caret-position="226">  
94 - <caret line="152" column="7" lean-forward="true" selection-start-line="152" selection-start-column="7" selection-end-line="152" selection-end-column="7" />  
95 - <folding>  
96 - <element signature="e#577#696#0#PHP" expanded="false" />  
97 - <element signature="e#702#1015#0#PHP" expanded="false" />  
98 - <element signature="e#1020#3095#0#PHP" expanded="false" />  
99 - <element signature="e#3101#3421#0#PHP" expanded="false" />  
100 - <element signature="e#3426#5507#0#PHP" expanded="false" />  
101 - <element signature="e#5513#5931#0#PHP" expanded="false" />  
102 - <element signature="e#5936#13233#0#PHP" expanded="false" />  
103 - <element signature="e#6737#13166#0#PHP" expanded="false" />  
104 - <element signature="e#7572#7860#0#PHP" expanded="false" />  
105 - <element signature="e#7937#8210#0#PHP" expanded="false" />  
106 - <element signature="e#8366#8676#0#PHP" expanded="false" />  
107 - <element signature="e#8751#9202#0#PHP" expanded="false" />  
108 - <element signature="e#9279#10323#0#PHP" expanded="false" />  
109 - <element signature="e#10417#10535#0#PHP" expanded="false" />  
110 - <element signature="e#13250#13547#0#PHP" expanded="false" />  
111 - <element signature="e#13553#13948#0#PHP" expanded="false" />  
112 - <element signature="e#13954#14374#0#PHP" expanded="false" />  
113 - <element signature="e#14379#21675#0#PHP" expanded="false" />  
114 - <element signature="e#16013#16301#0#PHP" expanded="false" />  
115 - <element signature="e#16377#16650#0#PHP" expanded="false" />  
116 - <element signature="e#16805#17115#0#PHP" expanded="false" />  
117 - <element signature="e#17190#17641#0#PHP" expanded="false" />  
118 - <element signature="e#17718#18762#0#PHP" expanded="false" />  
119 - <element signature="e#18856#18974#0#PHP" expanded="false" />  
120 - <element signature="e#21702#25404#0#PHP" expanded="false" />  
121 - <element signature="e#25434#28378#0#PHP" expanded="false" />  
122 - <element signature="e#28407#31857#0#PHP" expanded="false" />  
123 - <element signature="e#29283#29888#0#PHP" expanded="false" />  
124 - <element signature="e#29909#31346#0#PHP" expanded="false" />  
125 - <element signature="e#31394#31496#0#PHP" expanded="false" />  
126 - <element signature="e#31886#35623#0#PHP" expanded="false" />  
127 - <element signature="e#35646#35863#0#PHP" expanded="false" />  
128 - </folding> 96 + <state relative-caret-position="325">
  97 + <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
  98 + <folding />
  99 + </state>
  100 + </provider>
  101 + </entry>
  102 + </file>
  103 + <file leaf-file-name="vip.js" pinned="false" current-in-tab="false">
  104 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
  105 + <provider selected="true" editor-type-id="text-editor">
  106 + <state relative-caret-position="-25">
  107 + <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
  108 + <folding />
129 </state> 109 </state>
130 </provider> 110 </provider>
131 </entry> 111 </entry>
@@ -148,7 +128,6 @@ @@ -148,7 +128,6 @@
148 <component name="IdeDocumentHistory"> 128 <component name="IdeDocumentHistory">
149 <option name="CHANGED_PATHS"> 129 <option name="CHANGED_PATHS">
150 <list> 130 <list>
151 - <option value="$PROJECT_DIR$/application/config.php" />  
152 <option value="$PROJECT_DIR$/application/extra/upload.php" /> 131 <option value="$PROJECT_DIR$/application/extra/upload.php" />
153 <option value="$PROJECT_DIR$/application/admin/view/video/index.html" /> 132 <option value="$PROJECT_DIR$/application/admin/view/video/index.html" />
154 <option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" /> 133 <option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" />
@@ -194,11 +173,12 @@ @@ -194,11 +173,12 @@
194 <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> 173 <option value="$PROJECT_DIR$/application/nsms/nsms.php" />
195 <option value="$PROJECT_DIR$/application/extra/verify.php" /> 174 <option value="$PROJECT_DIR$/application/extra/verify.php" />
196 <option value="$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php" /> 175 <option value="$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php" />
197 - <option value="$PROJECT_DIR$/application/admin/view/vip/edit.html" />  
198 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
199 <option value="$PROJECT_DIR$/application/admin/view/vip/add.html" /> 176 <option value="$PROJECT_DIR$/application/admin/view/vip/add.html" />
200 <option value="$PROJECT_DIR$/application/api/controller/Notify.php" /> 177 <option value="$PROJECT_DIR$/application/api/controller/Notify.php" />
201 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 178 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
  179 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" />
  180 + <option value="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
  181 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
202 </list> 182 </list>
203 </option> 183 </option>
204 </component> 184 </component>
@@ -216,11 +196,11 @@ @@ -216,11 +196,11 @@
216 <sorting>DEFINITION_ORDER</sorting> 196 <sorting>DEFINITION_ORDER</sorting>
217 </component> 197 </component>
218 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 198 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
219 - <component name="ProjectFrameBounds" extendedState="1">  
220 - <option name="x" value="192" />  
221 - <option name="y" value="69" /> 199 + <component name="ProjectFrameBounds">
  200 + <option name="x" value="302" />
  201 + <option name="y" value="31" />
222 <option name="width" value="1776" /> 202 <option name="width" value="1776" />
223 - <option name="height" value="1082" /> 203 + <option name="height" value="1081" />
224 </component> 204 </component>
225 <component name="ProjectView"> 205 <component name="ProjectView">
226 <navigator currentView="ProjectPane" proportions="" version="1"> 206 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -245,6 +225,50 @@ @@ -245,6 +225,50 @@
245 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 225 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
246 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 226 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
247 </path> 227 </path>
  228 + <path>
  229 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  230 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  231 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  232 + </path>
  233 + <path>
  234 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  235 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  236 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  238 + </path>
  239 + <path>
  240 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  241 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  242 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  243 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  244 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
  245 + </path>
  246 + <path>
  247 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  248 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  249 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  250 + </path>
  251 + <path>
  252 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  253 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  254 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  255 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  256 + </path>
  257 + <path>
  258 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  259 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  260 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  261 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  262 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  263 + </path>
  264 + <path>
  265 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  266 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  267 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  268 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  269 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  270 + <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
  271 + </path>
248 </expand> 272 </expand>
249 <select /> 273 <select />
250 </subPane> 274 </subPane>
@@ -310,7 +334,7 @@ @@ -310,7 +334,7 @@
310 <workItem from="1574727687281" duration="17586000" /> 334 <workItem from="1574727687281" duration="17586000" />
311 <workItem from="1574759184313" duration="4793000" /> 335 <workItem from="1574759184313" duration="4793000" />
312 <workItem from="1574814989178" duration="1007000" /> 336 <workItem from="1574814989178" duration="1007000" />
313 - <workItem from="1574831367903" duration="12070000" /> 337 + <workItem from="1574831367903" duration="14295000" />
314 </task> 338 </task>
315 <task id="LOCAL-00001" summary="调试"> 339 <task id="LOCAL-00001" summary="调试">
316 <created>1574145133364</created> 340 <created>1574145133364</created>
@@ -323,7 +347,7 @@ @@ -323,7 +347,7 @@
323 <servers /> 347 <servers />
324 </component> 348 </component>
325 <component name="TimeTrackingManager"> 349 <component name="TimeTrackingManager">
326 - <option name="totallyTimeSpent" value="265727000" /> 350 + <option name="totallyTimeSpent" value="267952000" />
327 </component> 351 </component>
328 <component name="TodoView"> 352 <component name="TodoView">
329 <todo-panel id="selected-file"> 353 <todo-panel id="selected-file">
@@ -335,7 +359,7 @@ @@ -335,7 +359,7 @@
335 </todo-panel> 359 </todo-panel>
336 </component> 360 </component>
337 <component name="ToolWindowManager"> 361 <component name="ToolWindowManager">
338 - <frame x="192" y="69" width="1776" height="1082" extended-state="1" /> 362 + <frame x="302" y="31" width="1776" height="1081" extended-state="0" />
339 <editor active="true" /> 363 <editor active="true" />
340 <layout> 364 <layout>
341 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1462704" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 365 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1462704" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
@@ -393,27 +417,6 @@ @@ -393,27 +417,6 @@
393 <watches-manager /> 417 <watches-manager />
394 </component> 418 </component>
395 <component name="editorHistoryManager"> 419 <component name="editorHistoryManager">
396 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">  
397 - <provider selected="true" editor-type-id="text-editor">  
398 - <state relative-caret-position="587">  
399 - <caret line="83" column="10" lean-forward="true" selection-start-line="83" selection-start-column="10" selection-end-line="83" selection-end-column="10" />  
400 - </state>  
401 - </provider>  
402 - </entry>  
403 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">  
404 - <provider selected="true" editor-type-id="text-editor">  
405 - <state relative-caret-position="366">  
406 - <caret line="59" column="10" lean-forward="false" selection-start-line="59" selection-start-column="10" selection-end-line="59" selection-end-column="10" />  
407 - </state>  
408 - </provider>  
409 - </entry>  
410 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">  
411 - <provider selected="true" editor-type-id="text-editor">  
412 - <state relative-caret-position="200">  
413 - <caret line="8" column="33" lean-forward="true" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />  
414 - </state>  
415 - </provider>  
416 - </entry>  
417 <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php"> 420 <entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
418 <provider selected="true" editor-type-id="text-editor"> 421 <provider selected="true" editor-type-id="text-editor">
419 <state relative-caret-position="400"> 422 <state relative-caret-position="400">
@@ -688,7 +691,76 @@ @@ -688,7 +691,76 @@
688 </state> 691 </state>
689 </provider> 692 </provider>
690 </entry> 693 </entry>
691 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php"> 694 + <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
  695 + <provider selected="true" editor-type-id="text-editor">
  696 + <state relative-caret-position="150">
  697 + <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
  698 + <folding />
  699 + </state>
  700 + </provider>
  701 + </entry>
  702 + <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
  703 + <provider selected="true" editor-type-id="text-editor">
  704 + <state relative-caret-position="225">
  705 + <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
  706 + <folding />
  707 + </state>
  708 + </provider>
  709 + </entry>
  710 + <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
  711 + <provider selected="true" editor-type-id="text-editor">
  712 + <state relative-caret-position="203">
  713 + <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
  714 + <folding>
  715 + <element signature="e#1386#1991#0#PHP" expanded="false" />
  716 + <element signature="e#2012#3449#0#PHP" expanded="false" />
  717 + <element signature="e#3497#3599#0#PHP" expanded="false" />
  718 + </folding>
  719 + </state>
  720 + </provider>
  721 + </entry>
  722 + <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
  723 + <provider selected="true" editor-type-id="text-editor">
  724 + <state relative-caret-position="175">
  725 + <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="13" />
  726 + <folding>
  727 + <element signature="e#577#696#0#PHP" expanded="false" />
  728 + <element signature="e#702#1015#0#PHP" expanded="false" />
  729 + <element signature="e#1020#3095#0#PHP" expanded="false" />
  730 + <element signature="e#3101#3421#0#PHP" expanded="false" />
  731 + <element signature="e#3426#5507#0#PHP" expanded="false" />
  732 + <element signature="e#5513#5931#0#PHP" expanded="false" />
  733 + <element signature="e#5936#13233#0#PHP" expanded="false" />
  734 + <element signature="e#6737#13166#0#PHP" expanded="false" />
  735 + <element signature="e#7572#7860#0#PHP" expanded="false" />
  736 + <element signature="e#7937#8210#0#PHP" expanded="false" />
  737 + <element signature="e#8366#8676#0#PHP" expanded="false" />
  738 + <element signature="e#8751#9202#0#PHP" expanded="false" />
  739 + <element signature="e#9279#10323#0#PHP" expanded="false" />
  740 + <element signature="e#10417#10535#0#PHP" expanded="false" />
  741 + <element signature="e#13250#13547#0#PHP" expanded="false" />
  742 + <element signature="e#13553#13948#0#PHP" expanded="false" />
  743 + <element signature="e#13954#14374#0#PHP" expanded="false" />
  744 + <element signature="e#14379#21675#0#PHP" expanded="false" />
  745 + <element signature="e#16013#16301#0#PHP" expanded="false" />
  746 + <element signature="e#16377#16650#0#PHP" expanded="false" />
  747 + <element signature="e#16805#17115#0#PHP" expanded="false" />
  748 + <element signature="e#17190#17641#0#PHP" expanded="false" />
  749 + <element signature="e#17718#18762#0#PHP" expanded="false" />
  750 + <element signature="e#18856#18974#0#PHP" expanded="false" />
  751 + <element signature="e#21702#25404#0#PHP" expanded="false" />
  752 + <element signature="e#25434#28378#0#PHP" expanded="false" />
  753 + <element signature="e#28407#31857#0#PHP" expanded="false" />
  754 + <element signature="e#29283#29888#0#PHP" expanded="false" />
  755 + <element signature="e#29909#31346#0#PHP" expanded="false" />
  756 + <element signature="e#31394#31496#0#PHP" expanded="false" />
  757 + <element signature="e#31886#35623#0#PHP" expanded="false" />
  758 + <element signature="e#35646#35863#0#PHP" expanded="false" />
  759 + </folding>
  760 + </state>
  761 + </provider>
  762 + </entry>
  763 + <entry file="file://$PROJECT_DIR$/application/admin/validate/Vip.php">
692 <provider selected="true" editor-type-id="text-editor"> 764 <provider selected="true" editor-type-id="text-editor">
693 <state relative-caret-position="0"> 765 <state relative-caret-position="0">
694 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 766 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -696,42 +768,50 @@ @@ -696,42 +768,50 @@
696 </state> 768 </state>
697 </provider> 769 </provider>
698 </entry> 770 </entry>
699 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html"> 771 + <entry file="file://$PROJECT_DIR$/application/admin/model/Vip.php">
700 <provider selected="true" editor-type-id="text-editor"> 772 <provider selected="true" editor-type-id="text-editor">
701 - <state relative-caret-position="150">  
702 - <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" /> 773 + <state relative-caret-position="0">
  774 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
703 <folding /> 775 <folding />
704 </state> 776 </state>
705 </provider> 777 </provider>
706 </entry> 778 </entry>
707 - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html"> 779 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">
708 <provider selected="true" editor-type-id="text-editor"> 780 <provider selected="true" editor-type-id="text-editor">
709 - <state relative-caret-position="325">  
710 - <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" /> 781 + <state relative-caret-position="568">
  782 + <caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
711 <folding /> 783 <folding />
712 </state> 784 </state>
713 </provider> 785 </provider>
714 </entry> 786 </entry>
715 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js"> 787 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php">
716 <provider selected="true" editor-type-id="text-editor"> 788 <provider selected="true" editor-type-id="text-editor">
717 - <state relative-caret-position="-205">  
718 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 789 + <state relative-caret-position="200">
  790 + <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
719 <folding /> 791 <folding />
720 </state> 792 </state>
721 </provider> 793 </provider>
722 </entry> 794 </entry>
723 - <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php"> 795 + <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
724 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
725 - <state relative-caret-position="225">  
726 - <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" /> 797 + <state relative-caret-position="325">
  798 + <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
  799 + <folding />
  800 + </state>
  801 + </provider>
  802 + </entry>
  803 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
  804 + <provider selected="true" editor-type-id="text-editor">
  805 + <state relative-caret-position="-25">
  806 + <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
727 <folding /> 807 <folding />
728 </state> 808 </state>
729 </provider> 809 </provider>
730 </entry> 810 </entry>
731 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 811 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
732 <provider selected="true" editor-type-id="text-editor"> 812 <provider selected="true" editor-type-id="text-editor">
733 - <state relative-caret-position="275">  
734 - <caret line="17" column="26" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="26" /> 813 + <state relative-caret-position="378">
  814 + <caret line="785" column="7" lean-forward="true" selection-start-line="785" selection-start-column="7" selection-end-line="785" selection-end-column="7" />
735 <folding> 815 <folding>
736 <element signature="e#365#484#0#PHP" expanded="false" /> 816 <element signature="e#365#484#0#PHP" expanded="false" />
737 <element signature="e#490#1228#0#PHP" expanded="false" /> 817 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -763,8 +843,8 @@ @@ -763,8 +843,8 @@
763 <element signature="e#23830#24311#0#PHP" expanded="false" /> 843 <element signature="e#23830#24311#0#PHP" expanded="false" />
764 <element signature="e#24316#25086#0#PHP" expanded="false" /> 844 <element signature="e#24316#25086#0#PHP" expanded="false" />
765 <element signature="e#25092#25455#0#PHP" expanded="false" /> 845 <element signature="e#25092#25455#0#PHP" expanded="false" />
766 - <element signature="e#25460#25651#0#PHP" expanded="false" />  
767 <element signature="e#25657#26015#0#PHP" expanded="false" /> 846 <element signature="e#25657#26015#0#PHP" expanded="false" />
  847 + <element signature="e#26020#26211#0#PHP" expanded="false" />
768 <element signature="e#26217#27360#0#PHP" expanded="false" /> 848 <element signature="e#26217#27360#0#PHP" expanded="false" />
769 <element signature="e#27365#30030#0#PHP" expanded="false" /> 849 <element signature="e#27365#30030#0#PHP" expanded="false" />
770 <element signature="e#30036#30534#0#PHP" expanded="false" /> 850 <element signature="e#30036#30534#0#PHP" expanded="false" />
@@ -800,58 +880,5 @@ @@ -800,58 +880,5 @@
800 </state> 880 </state>
801 </provider> 881 </provider>
802 </entry> 882 </entry>
803 - <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">  
804 - <provider selected="true" editor-type-id="text-editor">  
805 - <state relative-caret-position="203">  
806 - <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />  
807 - <folding>  
808 - <element signature="e#1386#1991#0#PHP" expanded="false" />  
809 - <element signature="e#2012#3449#0#PHP" expanded="false" />  
810 - <element signature="e#3497#3599#0#PHP" expanded="false" />  
811 - </folding>  
812 - </state>  
813 - </provider>  
814 - </entry>  
815 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">  
816 - <provider selected="true" editor-type-id="text-editor">  
817 - <state relative-caret-position="226">  
818 - <caret line="152" column="7" lean-forward="true" selection-start-line="152" selection-start-column="7" selection-end-line="152" selection-end-column="7" />  
819 - <folding>  
820 - <element signature="e#577#696#0#PHP" expanded="false" />  
821 - <element signature="e#702#1015#0#PHP" expanded="false" />  
822 - <element signature="e#1020#3095#0#PHP" expanded="false" />  
823 - <element signature="e#3101#3421#0#PHP" expanded="false" />  
824 - <element signature="e#3426#5507#0#PHP" expanded="false" />  
825 - <element signature="e#5513#5931#0#PHP" expanded="false" />  
826 - <element signature="e#5936#13233#0#PHP" expanded="false" />  
827 - <element signature="e#6737#13166#0#PHP" expanded="false" />  
828 - <element signature="e#7572#7860#0#PHP" expanded="false" />  
829 - <element signature="e#7937#8210#0#PHP" expanded="false" />  
830 - <element signature="e#8366#8676#0#PHP" expanded="false" />  
831 - <element signature="e#8751#9202#0#PHP" expanded="false" />  
832 - <element signature="e#9279#10323#0#PHP" expanded="false" />  
833 - <element signature="e#10417#10535#0#PHP" expanded="false" />  
834 - <element signature="e#13250#13547#0#PHP" expanded="false" />  
835 - <element signature="e#13553#13948#0#PHP" expanded="false" />  
836 - <element signature="e#13954#14374#0#PHP" expanded="false" />  
837 - <element signature="e#14379#21675#0#PHP" expanded="false" />  
838 - <element signature="e#16013#16301#0#PHP" expanded="false" />  
839 - <element signature="e#16377#16650#0#PHP" expanded="false" />  
840 - <element signature="e#16805#17115#0#PHP" expanded="false" />  
841 - <element signature="e#17190#17641#0#PHP" expanded="false" />  
842 - <element signature="e#17718#18762#0#PHP" expanded="false" />  
843 - <element signature="e#18856#18974#0#PHP" expanded="false" />  
844 - <element signature="e#21702#25404#0#PHP" expanded="false" />  
845 - <element signature="e#25434#28378#0#PHP" expanded="false" />  
846 - <element signature="e#28407#31857#0#PHP" expanded="false" />  
847 - <element signature="e#29283#29888#0#PHP" expanded="false" />  
848 - <element signature="e#29909#31346#0#PHP" expanded="false" />  
849 - <element signature="e#31394#31496#0#PHP" expanded="false" />  
850 - <element signature="e#31886#35623#0#PHP" expanded="false" />  
851 - <element signature="e#35646#35863#0#PHP" expanded="false" />  
852 - </folding>  
853 - </state>  
854 - </provider>  
855 - </entry>  
856 </component> 883 </component>
857 </project> 884 </project>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 return [ 3 return [
4 'Content' => '会员介绍', 4 'Content' => '会员介绍',
5 - 'Text' => '会员须知', 5 + 'Desc' => '会员须知',
6 'Createtime' => '创建时间', 6 'Createtime' => '创建时间',
7 'Updatetime' => '修改时间' 7 'Updatetime' => '修改时间'
8 ]; 8 ];
@@ -7,9 +7,9 @@ @@ -7,9 +7,9 @@
7 </div> 7 </div>
8 </div> 8 </div>
9 <div class="form-group"> 9 <div class="form-group">
10 - <label class="control-label col-xs-12 col-sm-2">{:__('Text')}:</label> 10 + <label class="control-label col-xs-12 col-sm-2">{:__('Desc')}:</label>
11 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
12 - <textarea id="c-text" class="form-control editor" rows="5" name="row[text]" cols="50">{$row.text|htmlentities}</textarea> 12 + <textarea id="c-desc" class="form-control editor" rows="5" name="row[desc]" cols="50">{$row.desc|htmlentities}</textarea>
13 </div> 13 </div>
14 </div> 14 </div>
15 <div class="form-group layer-footer"> 15 <div class="form-group layer-footer">
@@ -787,7 +787,7 @@ class User extends Api @@ -787,7 +787,7 @@ class User extends Api
787 public function vipdetail() 787 public function vipdetail()
788 { 788 {
789 $data = Db::name('vip') 789 $data = Db::name('vip')
790 - ->field('text') 790 + ->field('desc')
791 ->where('id',2) 791 ->where('id',2)
792 ->find(); 792 ->find();
793 793