正在显示
2 个修改的文件
包含
49 行增加
和
118 行删除
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | - <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> | ||
5 | - <change afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" /> | ||
6 | - <change afterPath="$PROJECT_DIR$/application/home/view/public/head.html" afterDir="false" /> | ||
7 | - <change afterPath="$PROJECT_DIR$/application/home/view/public/js.html" afterDir="false" /> | ||
8 | - <change afterPath="$PROJECT_DIR$/application/home/view/public/nav.html" afterDir="false" /> | ||
9 | - <change afterPath="$PROJECT_DIR$/application/home/view/user/authorization_view.html" afterDir="false" /> | ||
10 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" afterDir="false" /> | ||
11 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/entry.css" afterDir="false" /> | ||
12 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/index.css" afterDir="false" /> | ||
13 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/input.css" afterDir="false" /> | ||
14 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/myInvite.css" afterDir="false" /> | ||
15 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/personal.css" afterDir="false" /> | ||
16 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" afterDir="false" /> | ||
17 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/public.css" afterDir="false" /> | ||
18 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/css/record.css" afterDir="false" /> | ||
19 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/add.png" afterDir="false" /> | ||
20 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/audio.mp3" afterDir="false" /> | ||
21 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/audio2.mp3" afterDir="false" /> | ||
22 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/audio3.mp3" afterDir="false" /> | ||
23 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/beff.png" afterDir="false" /> | ||
24 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/detail.png" afterDir="false" /> | ||
25 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/detail1.png" afterDir="false" /> | ||
26 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/examin.png" afterDir="false" /> | ||
27 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/examin1.png" afterDir="false" /> | ||
28 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/examinBg.png" afterDir="false" /> | ||
29 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/personal.png" afterDir="false" /> | ||
30 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/play.png" afterDir="false" /> | ||
31 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/right.png" afterDir="false" /> | ||
32 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/shop1.png" afterDir="false" /> | ||
33 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/shop2.png" afterDir="false" /> | ||
34 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/start.png" afterDir="false" /> | ||
35 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_01@2x.png" afterDir="false" /> | ||
36 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_02@2x.png" afterDir="false" /> | ||
37 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_03@2x.png" afterDir="false" /> | ||
38 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_04@2x.png" afterDir="false" /> | ||
39 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_05@2x.png" afterDir="false" /> | ||
40 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_06@2x.png" afterDir="false" /> | ||
41 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_07@2x.png" afterDir="false" /> | ||
42 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_08@2x.png" afterDir="false" /> | ||
43 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_09@2x.png" afterDir="false" /> | ||
44 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_10@2x.png" afterDir="false" /> | ||
45 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_17@2x.png" afterDir="false" /> | ||
46 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_18@2x.png" afterDir="false" /> | ||
47 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_19@2x.png" afterDir="false" /> | ||
48 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_20@2x.png" afterDir="false" /> | ||
49 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_21@2x.png" afterDir="false" /> | ||
50 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_22@2x.png" afterDir="false" /> | ||
51 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_23@2x.png" afterDir="false" /> | ||
52 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_26@2x.png" afterDir="false" /> | ||
53 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_27@2x.png" afterDir="false" /> | ||
54 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_28@3x.png" afterDir="false" /> | ||
55 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_29@3x.png" afterDir="false" /> | ||
56 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_30@3x.png" afterDir="false" /> | ||
57 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_31@3x.png" afterDir="false" /> | ||
58 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_32@3x.png" afterDir="false" /> | ||
59 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/sun_34@2x.png" afterDir="false" /> | ||
60 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/video.mp4" afterDir="false" /> | ||
61 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/img/weixin.png" afterDir="false" /> | ||
62 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/js/base.js" afterDir="false" /> | ||
63 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/js/jquery.js" afterDir="false" /> | ||
64 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/js/toast.js" afterDir="false" /> | ||
65 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/mui/city.data-3.js" afterDir="false" /> | ||
66 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.min.css" afterDir="false" /> | ||
67 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.min.js" afterDir="false" /> | ||
68 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.picker.min.css" afterDir="false" /> | ||
69 | - <change afterPath="$PROJECT_DIR$/public/assets/advertising/mui/mui.picker.min.js" afterDir="false" /> | ||
70 | - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | ||
71 | - <change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" /> | ||
72 | - </list> | 4 | + <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="" /> |
73 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 5 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
74 | <option name="TRACKING_ENABLED" value="true" /> | 6 | <option name="TRACKING_ENABLED" value="true" /> |
75 | <option name="SHOW_DIALOG" value="false" /> | 7 | <option name="SHOW_DIALOG" value="false" /> |
@@ -85,8 +17,8 @@ | @@ -85,8 +17,8 @@ | ||
85 | <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> | 17 | <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> |
86 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> | 18 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> |
87 | <provider selected="true" editor-type-id="text-editor"> | 19 | <provider selected="true" editor-type-id="text-editor"> |
88 | - <state relative-caret-position="68"> | ||
89 | - <caret line="4" column="73" selection-start-line="4" selection-start-column="73" selection-end-line="4" selection-end-column="73" /> | 20 | + <state relative-caret-position="357"> |
21 | + <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" /> | ||
90 | </state> | 22 | </state> |
91 | </provider> | 23 | </provider> |
92 | </entry> | 24 | </entry> |
@@ -130,20 +62,11 @@ | @@ -130,20 +62,11 @@ | ||
130 | </provider> | 62 | </provider> |
131 | </entry> | 63 | </entry> |
132 | </file> | 64 | </file> |
133 | - <file leaf-file-name="helper.php" pinned="false" current-in-tab="false"> | ||
134 | - <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> | ||
135 | - <provider selected="true" editor-type-id="text-editor"> | ||
136 | - <state relative-caret-position="289"> | ||
137 | - <caret line="279" column="71" selection-start-line="279" selection-start-column="66" selection-end-line="279" selection-end-column="71" /> | ||
138 | - </state> | ||
139 | - </provider> | ||
140 | - </entry> | ||
141 | - </file> | ||
142 | <file leaf-file-name="js.html" pinned="false" current-in-tab="false"> | 65 | <file leaf-file-name="js.html" pinned="false" current-in-tab="false"> |
143 | <entry file="file://$PROJECT_DIR$/application/home/view/public/js.html"> | 66 | <entry file="file://$PROJECT_DIR$/application/home/view/public/js.html"> |
144 | <provider selected="true" editor-type-id="text-editor"> | 67 | <provider selected="true" editor-type-id="text-editor"> |
145 | - <state relative-caret-position="136"> | ||
146 | - <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" /> | 68 | + <state relative-caret-position="119"> |
69 | + <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" /> | ||
147 | </state> | 70 | </state> |
148 | </provider> | 71 | </provider> |
149 | </entry> | 72 | </entry> |
@@ -505,7 +428,7 @@ | @@ -505,7 +428,7 @@ | ||
505 | <workItem from="1572223206994" duration="28857000" /> | 428 | <workItem from="1572223206994" duration="28857000" /> |
506 | <workItem from="1572309778506" duration="26117000" /> | 429 | <workItem from="1572309778506" duration="26117000" /> |
507 | <workItem from="1572395935540" duration="28313000" /> | 430 | <workItem from="1572395935540" duration="28313000" /> |
508 | - <workItem from="1572483209367" duration="10545000" /> | 431 | + <workItem from="1572483209367" duration="10866000" /> |
509 | </task> | 432 | </task> |
510 | <task id="LOCAL-00001" summary="数据库配置"> | 433 | <task id="LOCAL-00001" summary="数据库配置"> |
511 | <created>1571972429395</created> | 434 | <created>1571972429395</created> |
@@ -801,17 +724,24 @@ | @@ -801,17 +724,24 @@ | ||
801 | <option name="project" value="LOCAL" /> | 724 | <option name="project" value="LOCAL" /> |
802 | <updated>1572436574390</updated> | 725 | <updated>1572436574390</updated> |
803 | </task> | 726 | </task> |
804 | - <option name="localTasksCounter" value="43" /> | 727 | + <task id="LOCAL-00043" summary="调试授权登录"> |
728 | + <created>1572501549206</created> | ||
729 | + <option name="number" value="00043" /> | ||
730 | + <option name="presentableId" value="LOCAL-00043" /> | ||
731 | + <option name="project" value="LOCAL" /> | ||
732 | + <updated>1572501549206</updated> | ||
733 | + </task> | ||
734 | + <option name="localTasksCounter" value="44" /> | ||
805 | <servers /> | 735 | <servers /> |
806 | </component> | 736 | </component> |
807 | <component name="TimeTrackingManager"> | 737 | <component name="TimeTrackingManager"> |
808 | - <option name="totallyTimeSpent" value="224083000" /> | 738 | + <option name="totallyTimeSpent" value="224404000" /> |
809 | </component> | 739 | </component> |
810 | <component name="ToolWindowManager"> | 740 | <component name="ToolWindowManager"> |
811 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 741 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
812 | <editor active="true" /> | 742 | <editor active="true" /> |
813 | <layout> | 743 | <layout> |
814 | - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1380597" /> | 744 | + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1380597" /> |
815 | <window_info anchor="bottom" id="TODO" order="6" /> | 745 | <window_info anchor="bottom" id="TODO" order="6" /> |
816 | <window_info anchor="bottom" id="调试" order="7" /> | 746 | <window_info anchor="bottom" id="调试" order="7" /> |
817 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | 747 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
@@ -874,7 +804,8 @@ | @@ -874,7 +804,8 @@ | ||
874 | <MESSAGE value="提现" /> | 804 | <MESSAGE value="提现" /> |
875 | <MESSAGE value="调试提现" /> | 805 | <MESSAGE value="调试提现" /> |
876 | <MESSAGE value="权限调试" /> | 806 | <MESSAGE value="权限调试" /> |
877 | - <option name="LAST_COMMIT_MESSAGE" value="权限调试" /> | 807 | + <MESSAGE value="调试授权登录" /> |
808 | + <option name="LAST_COMMIT_MESSAGE" value="调试授权登录" /> | ||
878 | </component> | 809 | </component> |
879 | <component name="editorHistoryManager"> | 810 | <component name="editorHistoryManager"> |
880 | <entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/index.html"> | 811 | <entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/index.html"> |
@@ -1143,13 +1074,6 @@ | @@ -1143,13 +1074,6 @@ | ||
1143 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/mui/mui.min.js"> | 1074 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/mui/mui.min.js"> |
1144 | <provider selected="true" editor-type-id="text-editor" /> | 1075 | <provider selected="true" editor-type-id="text-editor" /> |
1145 | </entry> | 1076 | </entry> |
1146 | - <entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html"> | ||
1147 | - <provider selected="true" editor-type-id="text-editor"> | ||
1148 | - <state relative-caret-position="51"> | ||
1149 | - <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="49" /> | ||
1150 | - </state> | ||
1151 | - </provider> | ||
1152 | - </entry> | ||
1153 | <entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php"> | 1077 | <entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php"> |
1154 | <provider selected="true" editor-type-id="text-editor"> | 1078 | <provider selected="true" editor-type-id="text-editor"> |
1155 | <state relative-caret-position="578"> | 1079 | <state relative-caret-position="578"> |
@@ -1179,13 +1103,6 @@ | @@ -1179,13 +1103,6 @@ | ||
1179 | </state> | 1103 | </state> |
1180 | </provider> | 1104 | </provider> |
1181 | </entry> | 1105 | </entry> |
1182 | - <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> | ||
1183 | - <provider selected="true" editor-type-id="text-editor"> | ||
1184 | - <state relative-caret-position="289"> | ||
1185 | - <caret line="279" column="71" selection-start-line="279" selection-start-column="66" selection-end-line="279" selection-end-column="71" /> | ||
1186 | - </state> | ||
1187 | - </provider> | ||
1188 | - </entry> | ||
1189 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/js/toast.js"> | 1106 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/js/toast.js"> |
1190 | <provider selected="true" editor-type-id="text-editor"> | 1107 | <provider selected="true" editor-type-id="text-editor"> |
1191 | <state relative-caret-position="-278"> | 1108 | <state relative-caret-position="-278"> |
@@ -1193,20 +1110,6 @@ | @@ -1193,20 +1110,6 @@ | ||
1193 | </state> | 1110 | </state> |
1194 | </provider> | 1111 | </provider> |
1195 | </entry> | 1112 | </entry> |
1196 | - <entry file="file://$PROJECT_DIR$/application/home/view/public/js.html"> | ||
1197 | - <provider selected="true" editor-type-id="text-editor"> | ||
1198 | - <state relative-caret-position="136"> | ||
1199 | - <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" /> | ||
1200 | - </state> | ||
1201 | - </provider> | ||
1202 | - </entry> | ||
1203 | - <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> | ||
1204 | - <provider selected="true" editor-type-id="text-editor"> | ||
1205 | - <state> | ||
1206 | - <caret selection-end-line="1" /> | ||
1207 | - </state> | ||
1208 | - </provider> | ||
1209 | - </entry> | ||
1210 | <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> | 1113 | <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> |
1211 | <provider selected="true" editor-type-id="text-editor"> | 1114 | <provider selected="true" editor-type-id="text-editor"> |
1212 | <state relative-caret-position="742"> | 1115 | <state relative-caret-position="742"> |
@@ -1238,10 +1141,38 @@ | @@ -1238,10 +1141,38 @@ | ||
1238 | </state> | 1141 | </state> |
1239 | </provider> | 1142 | </provider> |
1240 | </entry> | 1143 | </entry> |
1144 | + <entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html"> | ||
1145 | + <provider selected="true" editor-type-id="text-editor"> | ||
1146 | + <state relative-caret-position="51"> | ||
1147 | + <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="49" /> | ||
1148 | + </state> | ||
1149 | + </provider> | ||
1150 | + </entry> | ||
1151 | + <entry file="file://$PROJECT_DIR$/application/home/view/public/js.html"> | ||
1152 | + <provider selected="true" editor-type-id="text-editor"> | ||
1153 | + <state relative-caret-position="119"> | ||
1154 | + <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" /> | ||
1155 | + </state> | ||
1156 | + </provider> | ||
1157 | + </entry> | ||
1158 | + <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> | ||
1159 | + <provider selected="true" editor-type-id="text-editor"> | ||
1160 | + <state relative-caret-position="289"> | ||
1161 | + <caret line="279" column="71" selection-start-line="279" selection-start-column="66" selection-end-line="279" selection-end-column="71" /> | ||
1162 | + </state> | ||
1163 | + </provider> | ||
1164 | + </entry> | ||
1165 | + <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> | ||
1166 | + <provider selected="true" editor-type-id="text-editor"> | ||
1167 | + <state> | ||
1168 | + <caret selection-end-line="1" /> | ||
1169 | + </state> | ||
1170 | + </provider> | ||
1171 | + </entry> | ||
1241 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> | 1172 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> |
1242 | <provider selected="true" editor-type-id="text-editor"> | 1173 | <provider selected="true" editor-type-id="text-editor"> |
1243 | - <state relative-caret-position="68"> | ||
1244 | - <caret line="4" column="73" selection-start-line="4" selection-start-column="73" selection-end-line="4" selection-end-column="73" /> | 1174 | + <state relative-caret-position="357"> |
1175 | + <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" /> | ||
1245 | </state> | 1176 | </state> |
1246 | </provider> | 1177 | </provider> |
1247 | </entry> | 1178 | </entry> |
-
请 注册 或 登录 后发表评论