Skip to content

php / bestpay

Go to a project
Commit 60f4ee5f by 张恒
Options

k

parent 28d7f241
Showing with 17 additions and 19 deletions
.idea/workspace.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.css" afterPath="$PROJECT_DIR$/css/main.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.css" afterPath="$PROJECT_DIR$/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -26,11 +27,11 @@ ...@@ -26,11 +27,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/main.scss"> <entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="365">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> <caret line="105" column="19" lean-forward="false" selection-start-line="105" selection-start-column="19" selection-end-line="105" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -46,11 +47,11 @@ ...@@ -46,11 +47,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="272">
<caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" /> <caret line="52" column="31" lean-forward="false" selection-start-line="52" selection-start-column="31" selection-end-line="52" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -69,9 +70,9 @@ ...@@ -69,9 +70,9 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/index.js" /> <option value="$PROJECT_DIR$/js/index.js" />
<option value="$PROJECT_DIR$/css/main.scss" /> <option value="$PROJECT_DIR$/css/main.scss" />
<option value="$PROJECT_DIR$/index.html" />
</list> </list>
</option> </option>
</component> </component>
...@@ -163,12 +164,12 @@ ...@@ -163,12 +164,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1513957319156</updated> <updated>1513957319156</updated>
<workItem from="1513957320785" duration="1075000" /> <workItem from="1513957320785" duration="1213000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1075000" /> <option name="totallyTimeSpent" value="1213000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="29" width="1440" height="821" extended-state="6" /> <frame x="0" y="29" width="1440" height="821" extended-state="6" />
...@@ -203,10 +204,10 @@ ...@@ -203,10 +204,10 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="365">
<caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" /> <caret line="105" column="19" lean-forward="false" selection-start-line="105" selection-start-column="19" selection-end-line="105" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -219,10 +220,10 @@ ...@@ -219,10 +220,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/main.scss"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="272">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> <caret line="52" column="31" lean-forward="false" selection-start-line="52" selection-start-column="31" selection-end-line="52" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
css/main.css
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
html, body { html, body {
width: 100%; width: 100%;
margin: 0; margin: 0;
background: url("../image/home-bj.jpg") no-repeat center;
background-size: 100% 100%;
font-family: helvetica; font-family: helvetica;
background: white; background: white;
height: 100%; height: 100%;
......
css/main.scss
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
html, body { html, body {
width: 100%; width: 100%;
margin: 0; margin: 0;
background: url("../image/home-bj.jpg") no-repeat center;
background-size: 100% 100%;
font-family: helvetica; font-family: helvetica;
background: white; background: white;
......
index.html
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
</div> </div>
<div class="page-info" style="display: none"> <div class="page-info" style="display: none">
<img class="map" src=""> <img class="map" src="">
<img src="image/d-b.jpg">
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment