王晓刚 / adverh5 · 提交

转到一个项目

作者 王晓刚
提交 69f0db1d85ba823931fe0f48117c1b549ab64460 1 个父辈 21510bdd
1 个管道 的构建 通过 耗费 0 秒

页面标题

内嵌 并排对比
正在显示 3 个修改的文件 包含 43 行增加 和 55 行删除
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment=""> 4 <list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/public/assets/adverh5/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/adverh5/css/index.css" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/application/home/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />
7 </list> 8 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 10 <option name="TRACKING_ENABLED" value="true" />
@@ -17,11 +18,11 @@ @@ -17,11 +18,11 @@
17 </component> 18 </component>
18 <component name="FileEditorManager"> 19 <component name="FileEditorManager">
19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 - <file leaf-file-name="Index.php" pinned="false" current-in-tab="false"> 21 + <file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
21 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 22 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
22 <provider selected="true" editor-type-id="text-editor"> 23 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="493">  
24 - <caret line="34" column="42" selection-start-line="34" selection-start-column="42" selection-end-line="34" selection-end-column="42" /> 24 + <state relative-caret-position="187">
  25 + <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
25 <folding> 26 <folding>
26 <element signature="e#128#163#0#PHP" expanded="true" /> 27 <element signature="e#128#163#0#PHP" expanded="true" />
27 </folding> 28 </folding>
@@ -50,8 +51,8 @@ @@ -50,8 +51,8 @@
50 <file leaf-file-name="login.html" pinned="false" current-in-tab="false"> 51 <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
51 <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html"> 52 <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
52 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
53 - <state relative-caret-position="608">  
54 - <caret line="98" column="41" lean-forward="true" selection-start-line="98" selection-start-column="41" selection-end-line="98" selection-end-column="41" /> 54 + <state relative-caret-position="799">
  55 + <caret line="47" column="16" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="16" />
55 <folding> 56 <folding>
56 <element signature="n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" /> 57 <element signature="n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
57 </folding> 58 </folding>
@@ -81,11 +82,11 @@ @@ -81,11 +82,11 @@
81 </provider> 82 </provider>
82 </entry> 83 </entry>
83 </file> 84 </file>
84 - <file leaf-file-name="index.css" pinned="false" current-in-tab="true"> 85 + <file leaf-file-name="index.css" pinned="false" current-in-tab="false">
85 <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css"> 86 <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
86 <provider selected="true" editor-type-id="text-editor"> 87 <provider selected="true" editor-type-id="text-editor">
87 - <state relative-caret-position="476">  
88 - <caret line="70" column="28" selection-start-line="70" selection-start-column="28" selection-end-line="70" selection-end-column="28" /> 88 + <state relative-caret-position="527">
  89 + <caret line="73" column="16" lean-forward="true" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" />
89 </state> 90 </state>
90 </provider> 91 </provider>
91 </entry> 92 </entry>
@@ -136,11 +137,11 @@ @@ -136,11 +137,11 @@
136 <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> 137 <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
137 <option value="$PROJECT_DIR$/application/database.php" /> 138 <option value="$PROJECT_DIR$/application/database.php" />
138 <option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" /> 139 <option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
139 - <option value="$PROJECT_DIR$/application/home/view/index/login.html" />  
140 <option value="$PROJECT_DIR$/application/config.php" /> 140 <option value="$PROJECT_DIR$/application/config.php" />
141 - <option value="$PROJECT_DIR$/application/home/controller/Index.php" />  
142 <option value="$PROJECT_DIR$/application/home/view/index/index.html" /> 141 <option value="$PROJECT_DIR$/application/home/view/index/index.html" />
143 <option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" /> 142 <option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
  143 + <option value="$PROJECT_DIR$/application/home/view/index/login.html" />
  144 + <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
144 </list> 145 </list>
145 </option> 146 </option>
146 </component> 147 </component>
@@ -309,7 +310,7 @@ @@ -309,7 +310,7 @@
309 <option name="presentableId" value="Default" /> 310 <option name="presentableId" value="Default" />
310 <updated>1571368480027</updated> 311 <updated>1571368480027</updated>
311 <workItem from="1571368481262" duration="23015000" /> 312 <workItem from="1571368481262" duration="23015000" />
312 - <workItem from="1571618159935" duration="8231000" /> 313 + <workItem from="1571618159935" duration="9147000" />
313 </task> 314 </task>
314 <task id="LOCAL-00001" summary="自动部署与数据可配置"> 315 <task id="LOCAL-00001" summary="自动部署与数据可配置">
315 <created>1571621636094</created> 316 <created>1571621636094</created>
@@ -444,11 +445,18 @@ @@ -444,11 +445,18 @@
444 <option name="project" value="LOCAL" /> 445 <option name="project" value="LOCAL" />
445 <updated>1571626698202</updated> 446 <updated>1571626698202</updated>
446 </task> 447 </task>
447 - <option name="localTasksCounter" value="20" /> 448 + <task id="LOCAL-00020" summary="手机端问题">
  449 + <created>1571626742647</created>
  450 + <option name="number" value="00020" />
  451 + <option name="presentableId" value="LOCAL-00020" />
  452 + <option name="project" value="LOCAL" />
  453 + <updated>1571626742647</updated>
  454 + </task>
  455 + <option name="localTasksCounter" value="21" />
448 <servers /> 456 <servers />
449 </component> 457 </component>
450 <component name="TimeTrackingManager"> 458 <component name="TimeTrackingManager">
451 - <option name="totallyTimeSpent" value="31246000" /> 459 + <option name="totallyTimeSpent" value="32162000" />
452 </component> 460 </component>
453 <component name="ToolWindowManager"> 461 <component name="ToolWindowManager">
454 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 462 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -743,16 +751,6 @@ @@ -743,16 +751,6 @@
743 </state> 751 </state>
744 </provider> 752 </provider>
745 </entry> 753 </entry>
746 - <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">  
747 - <provider selected="true" editor-type-id="text-editor">  
748 - <state relative-caret-position="608">  
749 - <caret line="98" column="41" lean-forward="true" selection-start-line="98" selection-start-column="41" selection-end-line="98" selection-end-column="41" />  
750 - <folding>  
751 - <element signature="n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />  
752 - </folding>  
753 - </state>  
754 - </provider>  
755 - </entry>  
756 <entry file="file://$PROJECT_DIR$/application/admin/config.php"> 754 <entry file="file://$PROJECT_DIR$/application/admin/config.php">
757 <provider selected="true" editor-type-id="text-editor" /> 755 <provider selected="true" editor-type-id="text-editor" />
758 </entry> 756 </entry>
@@ -763,13 +761,10 @@ @@ -763,13 +761,10 @@
763 </state> 761 </state>
764 </provider> 762 </provider>
765 </entry> 763 </entry>
766 - <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 764 + <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
767 <provider selected="true" editor-type-id="text-editor"> 765 <provider selected="true" editor-type-id="text-editor">
768 - <state relative-caret-position="493">  
769 - <caret line="34" column="42" selection-start-line="34" selection-start-column="42" selection-end-line="34" selection-end-column="42" />  
770 - <folding>  
771 - <element signature="e#128#163#0#PHP" expanded="true" />  
772 - </folding> 766 + <state relative-caret-position="527">
  767 + <caret line="73" column="16" lean-forward="true" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="16" />
773 </state> 768 </state>
774 </provider> 769 </provider>
775 </entry> 770 </entry>
@@ -784,10 +779,23 @@ @@ -784,10 +779,23 @@
784 </state> 779 </state>
785 </provider> 780 </provider>
786 </entry> 781 </entry>
787 - <entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css"> 782 + <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
788 <provider selected="true" editor-type-id="text-editor"> 783 <provider selected="true" editor-type-id="text-editor">
789 - <state relative-caret-position="476">  
790 - <caret line="70" column="28" selection-start-line="70" selection-start-column="28" selection-end-line="70" selection-end-column="28" /> 784 + <state relative-caret-position="799">
  785 + <caret line="47" column="16" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="16" />
  786 + <folding>
  787 + <element signature="n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" />
  788 + </folding>
  789 + </state>
  790 + </provider>
  791 + </entry>
  792 + <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
  793 + <provider selected="true" editor-type-id="text-editor">
  794 + <state relative-caret-position="187">
  795 + <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
  796 + <folding>
  797 + <element signature="e#128#163#0#PHP" expanded="true" />
  798 + </folding>
791 </state> 799 </state>
792 </provider> 800 </provider>
793 </entry> 801 </entry>
@@ -14,7 +14,7 @@ use think\Db; @@ -14,7 +14,7 @@ use think\Db;
14 class Index extends Controller 14 class Index extends Controller
15 { 15 {
16 public function login(){ 16 public function login(){
17 - $title = "登录"; 17 + $title = "迅维科技";
18 $this->assign('title',$title); 18 $this->assign('title',$title);
19 return $this->fetch(); 19 return $this->fetch();
20 } 20 }
@@ -43,26 +43,9 @@ @@ -43,26 +43,9 @@
43 </style> 43 </style>
44 <body> 44 <body>
45 <div class="toast">与服务器断开连接</div> 45 <div class="toast">与服务器断开连接</div>
46 -  
47 -  
48 -<!--<div class="mui-content bg-white">-->  
49 - <!--<div class="container-box">-->  
50 - <!--<form> 这里面是input输入框等。。。。</form>-->  
51 - <!--</div>-->  
52 - <!--<div class="operate mt30">-->  
53 - <!--<button class="mui-btn mui-btn-block btn-submit" type="button" id="submitButton">提交</button>-->  
54 - <!--</div>-->  
55 -<!--</div>-->  
56 -  
57 -  
58 -  
59 -  
60 -  
61 -  
62 <div class="container"> 46 <div class="container">
63 -  
64 <div class="title"> 47 <div class="title">
65 - 页面标题页面标题 48 + 迅维科技
66 </div> 49 </div>
67 <div class="password"> 50 <div class="password">
68 <div class="lock"> 51 <div class="lock">
@@ -72,9 +55,6 @@ @@ -72,9 +55,6 @@
72 <input id="password" type="password" placeholder="请输入密码"/> 55 <input id="password" type="password" placeholder="请输入密码"/>
73 </div> 56 </div>
74 </div> 57 </div>
75 -  
76 -  
77 -  
78 <div class="login_btn"> 58 <div class="login_btn">
79 登录 59 登录
80 </div> 60 </div>