张亚鹏 / Wechat_project_1 · 提交

转到一个项目

作者 乔爽
提交 2e739d64cca19ac61c4d4fb7bd834ab5069bdad3 1 个父辈 47967ecc

update

内嵌 并排对比
正在显示 13 个修改的文件 包含 486 行增加 和 333 行删除
@@ -3,9 +3,18 @@ @@ -3,9 +3,18 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" name="Default Changelist" comment=""> 4 <list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" name="Default Changelist" 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$/cpgg.html" beforeDir="false" afterPath="$PROJECT_DIR$/cpgg.html" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/cplb.html" beforeDir="false" afterPath="$PROJECT_DIR$/cplb.html" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/cpxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/cpxq.html" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/css/cpgg.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpgg.css" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/css/cplb.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cplb.css" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/css/cpxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpxq.css" afterDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/css/ggbt.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/ggbt.css" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/css/gift.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gift.css" afterDir="false" /> 13 <change beforePath="$PROJECT_DIR$/css/gift.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gift.css" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/css/slxz.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/slxz.css" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/ggbt.html" beforeDir="false" afterPath="$PROJECT_DIR$/ggbt.html" afterDir="false" />
7 <change beforePath="$PROJECT_DIR$/gift.html" beforeDir="false" afterPath="$PROJECT_DIR$/gift.html" afterDir="false" /> 16 <change beforePath="$PROJECT_DIR$/gift.html" beforeDir="false" afterPath="$PROJECT_DIR$/gift.html" afterDir="false" />
8 - <change beforePath="$PROJECT_DIR$/iconfont/iconfont.css" beforeDir="false" afterPath="$PROJECT_DIR$/iconfont/iconfont.css" afterDir="false" /> 17 + <change beforePath="$PROJECT_DIR$/slxz.html" beforeDir="false" afterPath="$PROJECT_DIR$/slxz.html" afterDir="false" />
9 </list> 18 </list>
10 <ignored path="$PROJECT_DIR$/.tmp/" /> 19 <ignored path="$PROJECT_DIR$/.tmp/" />
11 <ignored path="$PROJECT_DIR$/temp/" /> 20 <ignored path="$PROJECT_DIR$/temp/" />
@@ -61,38 +70,39 @@ @@ -61,38 +70,39 @@
61 <session id="848140438"> 70 <session id="848140438">
62 <usages-collector id="statistics.lifecycle.project"> 71 <usages-collector id="statistics.lifecycle.project">
63 <counts> 72 <counts>
64 - <entry key="project.closed" value="6" /> 73 + <entry key="project.closed" value="9" />
65 <entry key="project.open.time.0" value="1" /> 74 <entry key="project.open.time.0" value="1" />
66 - <entry key="project.open.time.1" value="1" /> 75 + <entry key="project.open.time.1" value="3" />
67 <entry key="project.open.time.19" value="1" /> 76 <entry key="project.open.time.19" value="1" />
68 <entry key="project.open.time.2" value="1" /> 77 <entry key="project.open.time.2" value="1" />
69 - <entry key="project.open.time.20" value="1" /> 78 + <entry key="project.open.time.20" value="2" />
  79 + <entry key="project.open.time.6" value="1" />
70 <entry key="project.open.time.8" value="1" /> 80 <entry key="project.open.time.8" value="1" />
71 - <entry key="project.opened" value="6" /> 81 + <entry key="project.opened" value="10" />
72 </counts> 82 </counts>
73 </usages-collector> 83 </usages-collector>
74 <usages-collector id="statistics.file.extensions.edit"> 84 <usages-collector id="statistics.file.extensions.edit">
75 <counts> 85 <counts>
76 - <entry key="css" value="1568" />  
77 - <entry key="html" value="1742" /> 86 + <entry key="css" value="1880" />
  87 + <entry key="html" value="2111" />
78 </counts> 88 </counts>
79 </usages-collector> 89 </usages-collector>
80 <usages-collector id="statistics.file.types.edit"> 90 <usages-collector id="statistics.file.types.edit">
81 <counts> 91 <counts>
82 - <entry key="CSS" value="1569" />  
83 - <entry key="HTML" value="1741" /> 92 + <entry key="CSS" value="1881" />
  93 + <entry key="HTML" value="2110" />
84 </counts> 94 </counts>
85 </usages-collector> 95 </usages-collector>
86 <usages-collector id="statistics.file.extensions.open"> 96 <usages-collector id="statistics.file.extensions.open">
87 <counts> 97 <counts>
88 - <entry key="css" value="11" />  
89 - <entry key="html" value="12" /> 98 + <entry key="css" value="19" />
  99 + <entry key="html" value="21" />
90 </counts> 100 </counts>
91 </usages-collector> 101 </usages-collector>
92 <usages-collector id="statistics.file.types.open"> 102 <usages-collector id="statistics.file.types.open">
93 <counts> 103 <counts>
94 - <entry key="CSS" value="11" />  
95 - <entry key="HTML" value="12" /> 104 + <entry key="CSS" value="19" />
  105 + <entry key="HTML" value="21" />
96 </counts> 106 </counts>
97 </usages-collector> 107 </usages-collector>
98 </session> 108 </session>
@@ -100,88 +110,122 @@ @@ -100,88 +110,122 @@
100 <component name="FileEditorManager"> 110 <component name="FileEditorManager">
101 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 111 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
102 <file pinned="false" current-in-tab="false"> 112 <file pinned="false" current-in-tab="false">
103 - <entry file="file://$PROJECT_DIR$/gift.html"> 113 + <entry file="file://$PROJECT_DIR$/css/gift.css">
104 <provider selected="true" editor-type-id="text-editor"> 114 <provider selected="true" editor-type-id="text-editor">
105 - <state relative-caret-position="476">  
106 - <caret line="140" column="6" lean-forward="true" selection-start-line="140" selection-start-column="6" selection-end-line="140" selection-end-column="6" />  
107 - <folding>  
108 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
109 - </folding> 115 + <state relative-caret-position="324">
  116 + <caret line="12" column="12" lean-forward="true" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
110 </state> 117 </state>
111 </provider> 118 </provider>
112 </entry> 119 </entry>
113 </file> 120 </file>
114 <file pinned="false" current-in-tab="false"> 121 <file pinned="false" current-in-tab="false">
115 - <entry file="file://$PROJECT_DIR$/iconfont/iconfont.css"> 122 + <entry file="file://$PROJECT_DIR$/cplb.html">
116 <provider selected="true" editor-type-id="text-editor"> 123 <provider selected="true" editor-type-id="text-editor">
117 - <state relative-caret-position="432">  
118 - <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" /> 124 + <state relative-caret-position="407">
  125 + <caret line="269" column="60" selection-start-line="269" selection-start-column="60" selection-end-line="269" selection-end-column="60" />
119 <folding> 126 <folding>
120 - <element signature="e#257#1171#1" expanded="true" /> 127 + <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  128 + <element signature="n#div#5;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  129 + <element signature="n#div#6;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  130 + <element signature="n#div#7;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  131 + <element signature="n#div#8;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  132 + <element signature="n#div#9;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  133 + <element signature="n#div#10;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  134 + <element signature="n#div#11;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  135 + <element signature="n#div#12;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  136 + <element signature="n#div#13;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  137 + <element signature="n#div#14;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  138 + <element signature="n#div#15;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  139 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
121 </folding> 140 </folding>
122 </state> 141 </state>
123 </provider> 142 </provider>
124 </entry> 143 </entry>
125 </file> 144 </file>
126 - <file pinned="false" current-in-tab="true">  
127 - <entry file="file://$PROJECT_DIR$/css/gift.css"> 145 + <file pinned="false" current-in-tab="false">
  146 + <entry file="file://$PROJECT_DIR$/index.html">
128 <provider selected="true" editor-type-id="text-editor"> 147 <provider selected="true" editor-type-id="text-editor">
129 - <state relative-caret-position="223">  
130 - <caret line="135" column="1" lean-forward="true" selection-start-line="135" selection-start-column="1" selection-end-line="135" selection-end-column="1" /> 148 + <state relative-caret-position="324">
  149 + <caret line="12" column="27" lean-forward="true" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
131 </state> 150 </state>
132 </provider> 151 </provider>
133 </entry> 152 </entry>
134 </file> 153 </file>
135 - <file pinned="false" current-in-tab="false">  
136 - <entry file="file://$PROJECT_DIR$/spxq.html"> 154 + <file pinned="false" current-in-tab="true">
  155 + <entry file="file://$PROJECT_DIR$/gift.html">
137 <provider selected="true" editor-type-id="text-editor"> 156 <provider selected="true" editor-type-id="text-editor">
138 - <state relative-caret-position="1377">  
139 - <caret line="51" selection-start-line="51" selection-end-line="51" /> 157 + <state relative-caret-position="344">
  158 + <caret line="120" column="22" lean-forward="true" selection-start-line="120" selection-start-column="22" selection-end-line="120" selection-end-column="22" />
  159 + <folding>
  160 + <element signature="n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  161 + <element signature="n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  162 + <element signature="n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  163 + <element signature="n#div#3;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  164 + <element signature="n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  165 + <element signature="n#div#0;n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  166 + <element signature="n#div#1;n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  167 + <element signature="n#div#5;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  168 + <element signature="n#div#0;n#div#5;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  169 + <element signature="n#div#6;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  170 + <element signature="n#div#7;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  171 + <element signature="n#div#8;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  172 + <element signature="n#div#9;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  173 + <element signature="n#div#10;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  174 + <element signature="n#div#0;n#div#10;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  175 + <element signature="n#div#1;n#div#10;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  176 + <element signature="n#div#11;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  177 + <element signature="n#div#0;n#div#11;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  178 + </folding>
140 </state> 179 </state>
141 </provider> 180 </provider>
142 </entry> 181 </entry>
143 </file> 182 </file>
144 <file pinned="false" current-in-tab="false"> 183 <file pinned="false" current-in-tab="false">
145 - <entry file="file://$PROJECT_DIR$/css/first.css"> 184 + <entry file="file://$PROJECT_DIR$/cpxq.html">
146 <provider selected="true" editor-type-id="text-editor"> 185 <provider selected="true" editor-type-id="text-editor">
147 - <state relative-caret-position="2916">  
148 - <caret line="108" column="19" selection-start-line="108" selection-start-column="19" selection-end-line="108" selection-end-column="19" /> 186 + <state relative-caret-position="216">
  187 + <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
149 </state> 188 </state>
150 </provider> 189 </provider>
151 </entry> 190 </entry>
152 </file> 191 </file>
153 <file pinned="false" current-in-tab="false"> 192 <file pinned="false" current-in-tab="false">
154 - <entry file="file://$PROJECT_DIR$/first.html"> 193 + <entry file="file://$PROJECT_DIR$/css/ggbt.css">
155 <provider selected="true" editor-type-id="text-editor"> 194 <provider selected="true" editor-type-id="text-editor">
156 - <state relative-caret-position="702">  
157 - <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" /> 195 + <state>
  196 + <caret selection-end-line="4" selection-end-column="1" />
158 </state> 197 </state>
159 </provider> 198 </provider>
160 </entry> 199 </entry>
161 </file> 200 </file>
162 <file pinned="false" current-in-tab="false"> 201 <file pinned="false" current-in-tab="false">
163 - <entry file="file://$PROJECT_DIR$/index.html"> 202 + <entry file="file://$PROJECT_DIR$/slxz.html">
164 <provider selected="true" editor-type-id="text-editor"> 203 <provider selected="true" editor-type-id="text-editor">
165 - <state relative-caret-position="2106">  
166 - <caret line="78" column="39" selection-start-line="78" selection-start-column="39" selection-end-line="78" selection-end-column="39" /> 204 + <state relative-caret-position="216">
  205 + <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
  206 + <folding>
  207 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  208 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  209 + <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  210 + </folding>
167 </state> 211 </state>
168 </provider> 212 </provider>
169 </entry> 213 </entry>
170 </file> 214 </file>
171 <file pinned="false" current-in-tab="false"> 215 <file pinned="false" current-in-tab="false">
172 - <entry file="file://$PROJECT_DIR$/css/index.css"> 216 + <entry file="file://$PROJECT_DIR$/css/cpgg.css">
173 <provider selected="true" editor-type-id="text-editor"> 217 <provider selected="true" editor-type-id="text-editor">
174 - <state relative-caret-position="1728">  
175 - <caret line="64" column="30" selection-start-line="64" selection-start-column="30" selection-end-line="64" selection-end-column="30" /> 218 + <state relative-caret-position="234">
  219 + <caret line="108" column="23" lean-forward="true" selection-start-line="108" selection-start-column="23" selection-end-line="108" selection-end-column="23" />
176 </state> 220 </state>
177 </provider> 221 </provider>
178 </entry> 222 </entry>
179 </file> 223 </file>
180 <file pinned="false" current-in-tab="false"> 224 <file pinned="false" current-in-tab="false">
181 - <entry file="file://$PROJECT_DIR$/css/cpgg.css"> 225 + <entry file="file://$PROJECT_DIR$/css/slxz.css">
182 <provider selected="true" editor-type-id="text-editor"> 226 <provider selected="true" editor-type-id="text-editor">
183 - <state relative-caret-position="1674">  
184 - <caret line="62" column="27" selection-start-line="62" selection-start-column="27" selection-end-line="62" selection-end-column="27" /> 227 + <state relative-caret-position="216">
  228 + <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
185 </state> 229 </state>
186 </provider> 230 </provider>
187 </entry> 231 </entry>
@@ -189,8 +233,13 @@ @@ -189,8 +233,13 @@
189 <file pinned="false" current-in-tab="false"> 233 <file pinned="false" current-in-tab="false">
190 <entry file="file://$PROJECT_DIR$/cpgg.html"> 234 <entry file="file://$PROJECT_DIR$/cpgg.html">
191 <provider selected="true" editor-type-id="text-editor"> 235 <provider selected="true" editor-type-id="text-editor">
192 - <state relative-caret-position="3240">  
193 - <caret line="120" column="14" selection-start-line="120" selection-start-column="14" selection-end-line="120" selection-end-column="14" /> 236 + <state relative-caret-position="208">
  237 + <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
  238 + <folding>
  239 + <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  240 + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  241 + <element signature="n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  242 + </folding>
194 </state> 243 </state>
195 </provider> 244 </provider>
196 </entry> 245 </entry>
@@ -207,13 +256,6 @@ @@ -207,13 +256,6 @@
207 </component> 256 </component>
208 <component name="FindInProjectRecents"> 257 <component name="FindInProjectRecents">
209 <findStrings> 258 <findStrings>
210 - <find>footer</find>  
211 - <find>footer_mid</find>  
212 - <find>main_top</find>  
213 - <find>border</find>  
214 - <find>main_doc</find>  
215 - <find>main_item_titl</find>  
216 - <find>.box_main_next</find>  
217 <find>menu</find> 259 <find>menu</find>
218 <find>footer_mid_right_author</find> 260 <find>footer_mid_right_author</find>
219 <find>icon-shang</find> 261 <find>icon-shang</find>
@@ -237,6 +279,13 @@ @@ -237,6 +279,13 @@
237 <find>btn_top</find> 279 <find>btn_top</find>
238 <find>icon_</find> 280 <find>icon_</find>
239 <find>icon_price</find> 281 <find>icon_price</find>
  282 + <find>.main_search</find>
  283 + <find>main_top_left</find>
  284 + <find>.main_item_time</find>
  285 + <find>.main_top</find>
  286 + <find>main_top_le</find>
  287 + <find>menu_container</find>
  288 + <find>main_bottom_time</find>
240 </findStrings> 289 </findStrings>
241 <dirStrings> 290 <dirStrings>
242 <dir>F:\ljh\上传资料企业微信\images</dir> 291 <dir>F:\ljh\上传资料企业微信\images</dir>
@@ -248,7 +297,6 @@ @@ -248,7 +297,6 @@
248 <component name="IdeDocumentHistory"> 297 <component name="IdeDocumentHistory">
249 <option name="CHANGED_PATHS"> 298 <option name="CHANGED_PATHS">
250 <list> 299 <list>
251 - <option value="$PROJECT_DIR$/css/common.css" />  
252 <option value="$PROJECT_DIR$/anno_return.html" /> 300 <option value="$PROJECT_DIR$/anno_return.html" />
253 <option value="$PROJECT_DIR$/css/anno_return.css" /> 301 <option value="$PROJECT_DIR$/css/anno_return.css" />
254 <option value="$PROJECT_DIR$/css/list_turn.css" /> 302 <option value="$PROJECT_DIR$/css/list_turn.css" />
@@ -267,26 +315,28 @@ @@ -267,26 +315,28 @@
267 <option value="$PROJECT_DIR$/pro_list.html" /> 315 <option value="$PROJECT_DIR$/pro_list.html" />
268 <option value="$PROJECT_DIR$/css/sub_6.css" /> 316 <option value="$PROJECT_DIR$/css/sub_6.css" />
269 <option value="$PROJECT_DIR$/sub_6.html" /> 317 <option value="$PROJECT_DIR$/sub_6.html" />
270 - <option value="$PROJECT_DIR$/ggbt.html" />  
271 - <option value="$PROJECT_DIR$/css/ggbt.css" />  
272 - <option value="$PROJECT_DIR$/cpgg.html" />  
273 <option value="$PROJECT_DIR$/list_turn.html" /> 318 <option value="$PROJECT_DIR$/list_turn.html" />
274 - <option value="$PROJECT_DIR$/cpxq.html" />  
275 - <option value="$PROJECT_DIR$/cplb.html" />  
276 <option value="$PROJECT_DIR$/spxq.html" /> 319 <option value="$PROJECT_DIR$/spxq.html" />
277 <option value="$PROJECT_DIR$/last.html" /> 320 <option value="$PROJECT_DIR$/last.html" />
278 - <option value="$PROJECT_DIR$/css/cplb.css" />  
279 - <option value="$PROJECT_DIR$/css/cpgg.css" />  
280 - <option value="$PROJECT_DIR$/css/cpxq.css" />  
281 <option value="$PROJECT_DIR$/wtfk.html" /> 321 <option value="$PROJECT_DIR$/wtfk.html" />
282 - <option value="$PROJECT_DIR$/slxz.html" />  
283 <option value="$PROJECT_DIR$/css/wtfk.css" /> 322 <option value="$PROJECT_DIR$/css/wtfk.css" />
284 <option value="$PROJECT_DIR$/first.html" /> 323 <option value="$PROJECT_DIR$/first.html" />
285 <option value="$PROJECT_DIR$/index.html" /> 324 <option value="$PROJECT_DIR$/index.html" />
286 <option value="$PROJECT_DIR$/css/index.css" /> 325 <option value="$PROJECT_DIR$/css/index.css" />
287 <option value="$PROJECT_DIR$/iconfont/iconfont.css" /> 326 <option value="$PROJECT_DIR$/iconfont/iconfont.css" />
288 - <option value="$PROJECT_DIR$/css/gift.css" /> 327 + <option value="$PROJECT_DIR$/css/cplb.css" />
  328 + <option value="$PROJECT_DIR$/css/common.css" />
  329 + <option value="$PROJECT_DIR$/css/cpxq.css" />
  330 + <option value="$PROJECT_DIR$/cpxq.html" />
  331 + <option value="$PROJECT_DIR$/ggbt.html" />
  332 + <option value="$PROJECT_DIR$/css/ggbt.css" />
  333 + <option value="$PROJECT_DIR$/slxz.html" />
  334 + <option value="$PROJECT_DIR$/css/slxz.css" />
289 <option value="$PROJECT_DIR$/gift.html" /> 335 <option value="$PROJECT_DIR$/gift.html" />
  336 + <option value="$PROJECT_DIR$/css/gift.css" />
  337 + <option value="$PROJECT_DIR$/cplb.html" />
  338 + <option value="$PROJECT_DIR$/cpgg.html" />
  339 + <option value="$PROJECT_DIR$/css/cpgg.css" />
290 </list> 340 </list>
291 </option> 341 </option>
292 </component> 342 </component>
@@ -297,10 +347,10 @@ @@ -297,10 +347,10 @@
297 <sorting>DEFINITION_ORDER</sorting> 347 <sorting>DEFINITION_ORDER</sorting>
298 </component> 348 </component>
299 <component name="ProjectFrameBounds"> 349 <component name="ProjectFrameBounds">
300 - <option name="x" value="181" />  
301 - <option name="y" value="121" />  
302 - <option name="width" value="1692" />  
303 - <option name="height" value="1046" /> 350 + <option name="x" value="560" />
  351 + <option name="y" value="126" />
  352 + <option name="width" value="1389" />
  353 + <option name="height" value="1048" />
304 </component> 354 </component>
305 <component name="ProjectView"> 355 <component name="ProjectView">
306 <navigator proportions="" version="1"> 356 <navigator proportions="" version="1">
@@ -392,16 +442,21 @@ @@ -392,16 +442,21 @@
392 <workItem from="1546934883561" duration="3522000" /> 442 <workItem from="1546934883561" duration="3522000" />
393 <workItem from="1546938871546" duration="2893000" /> 443 <workItem from="1546938871546" duration="2893000" />
394 <workItem from="1546994713069" duration="3637000" /> 444 <workItem from="1546994713069" duration="3637000" />
  445 + <workItem from="1547001843887" duration="1693000" />
  446 + <workItem from="1547087204760" duration="621000" />
  447 + <workItem from="1547193494763" duration="271000" />
  448 + <workItem from="1547443978963" duration="8654000" />
395 </task> 449 </task>
396 <servers /> 450 <servers />
397 </component> 451 </component>
398 <component name="TimeTrackingManager"> 452 <component name="TimeTrackingManager">
399 - <option name="totallyTimeSpent" value="154349000" /> 453 + <option name="totallyTimeSpent" value="165588000" />
400 </component> 454 </component>
401 <component name="ToolWindowManager"> 455 <component name="ToolWindowManager">
402 - <frame x="181" y="121" width="1692" height="1046" extended-state="0" /> 456 + <frame x="560" y="126" width="1389" height="1048" extended-state="0" />
  457 + <editor active="true" />
403 <layout> 458 <layout>
404 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15114874" /> 459 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18504812" />
405 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 460 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
406 <window_info id="Favorites" order="2" side_tool="true" /> 461 <window_info id="Favorites" order="2" side_tool="true" />
407 <window_info anchor="bottom" id="Message" order="0" /> 462 <window_info anchor="bottom" id="Message" order="0" />
@@ -413,7 +468,7 @@ @@ -413,7 +468,7 @@
413 <window_info anchor="bottom" id="TODO" order="6" /> 468 <window_info anchor="bottom" id="TODO" order="6" />
414 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 469 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
415 <window_info anchor="bottom" id="Version Control" order="8" /> 470 <window_info anchor="bottom" id="Version Control" order="8" />
416 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.08671789" /> 471 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.30010954" />
417 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 472 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
418 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 473 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
419 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 474 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -430,13 +485,6 @@ @@ -430,13 +485,6 @@
430 <entry file="file://$PROJECT_DIR$/js/base.js"> 485 <entry file="file://$PROJECT_DIR$/js/base.js">
431 <provider selected="true" editor-type-id="text-editor" /> 486 <provider selected="true" editor-type-id="text-editor" />
432 </entry> 487 </entry>
433 - <entry file="file://$PROJECT_DIR$/css/common.css">  
434 - <provider selected="true" editor-type-id="text-editor">  
435 - <state relative-caret-position="189">  
436 - <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />  
437 - </state>  
438 - </provider>  
439 - </entry>  
440 <entry file="file://$PROJECT_DIR$/css/list_turn.css"> 488 <entry file="file://$PROJECT_DIR$/css/list_turn.css">
441 <provider selected="true" editor-type-id="text-editor"> 489 <provider selected="true" editor-type-id="text-editor">
442 <state relative-caret-position="162"> 490 <state relative-caret-position="162">
@@ -454,156 +502,202 @@ @@ -454,156 +502,202 @@
454 <entry file="file://$PROJECT_DIR$/js/jquery.min.js"> 502 <entry file="file://$PROJECT_DIR$/js/jquery.min.js">
455 <provider selected="true" editor-type-id="text-editor" /> 503 <provider selected="true" editor-type-id="text-editor" />
456 </entry> 504 </entry>
457 - <entry file="file://$PROJECT_DIR$/css/slxz.css"> 505 + <entry file="file://$PROJECT_DIR$/wtfk.html">
458 <provider selected="true" editor-type-id="text-editor"> 506 <provider selected="true" editor-type-id="text-editor">
459 - <state relative-caret-position="329">  
460 - <caret line="129" column="19" lean-forward="true" selection-start-line="129" selection-start-column="19" selection-end-line="129" selection-end-column="19" /> 507 + <state relative-caret-position="143">
  508 + <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
461 </state> 509 </state>
462 </provider> 510 </provider>
463 </entry> 511 </entry>
464 - <entry file="file://$PROJECT_DIR$/list_turn.html"> 512 + <entry file="file://$PROJECT_DIR$/css/wtfk.css">
465 <provider selected="true" editor-type-id="text-editor"> 513 <provider selected="true" editor-type-id="text-editor">
466 - <state relative-caret-position="756">  
467 - <caret line="28" column="25" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="25" /> 514 + <state relative-caret-position="2565">
  515 + <caret line="95" column="23" lean-forward="true" selection-start-line="95" selection-start-column="23" selection-end-line="95" selection-end-column="23" />
468 </state> 516 </state>
469 </provider> 517 </provider>
470 </entry> 518 </entry>
471 - <entry file="file://$PROJECT_DIR$/cplb.html"> 519 + <entry file="file://$PROJECT_DIR$/iconfont/iconfont.css">
472 <provider selected="true" editor-type-id="text-editor"> 520 <provider selected="true" editor-type-id="text-editor">
473 - <state relative-caret-position="257">  
474 - <caret line="187" column="26" lean-forward="true" selection-start-line="187" selection-start-column="26" selection-end-line="187" selection-end-column="26" /> 521 + <state relative-caret-position="432">
  522 + <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
475 </state> 523 </state>
476 </provider> 524 </provider>
477 </entry> 525 </entry>
478 - <entry file="file://$PROJECT_DIR$/css/cplb.css"> 526 + <entry file="file://$PROJECT_DIR$/spxq.html">
479 <provider selected="true" editor-type-id="text-editor"> 527 <provider selected="true" editor-type-id="text-editor">
480 - <state relative-caret-position="278">  
481 - <caret line="116" column="23" lean-forward="true" selection-start-line="116" selection-start-column="23" selection-end-line="116" selection-end-column="23" /> 528 + <state relative-caret-position="1377">
  529 + <caret line="51" selection-start-line="51" selection-end-line="51" />
482 </state> 530 </state>
483 </provider> 531 </provider>
484 </entry> 532 </entry>
485 - <entry file="file://$PROJECT_DIR$/cpxq.html"> 533 + <entry file="file://$PROJECT_DIR$/list_turn.html">
486 <provider selected="true" editor-type-id="text-editor"> 534 <provider selected="true" editor-type-id="text-editor">
487 - <state relative-caret-position="2025">  
488 - <caret line="94" column="44" lean-forward="true" selection-start-line="94" selection-start-column="44" selection-end-line="94" selection-end-column="44" /> 535 + <state relative-caret-position="297">
  536 + <caret line="11" column="23" lean-forward="true" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
489 </state> 537 </state>
490 </provider> 538 </provider>
491 </entry> 539 </entry>
492 - <entry file="file://$PROJECT_DIR$/css/cpxq.css"> 540 + <entry file="file://$PROJECT_DIR$/css/first.css">
493 <provider selected="true" editor-type-id="text-editor"> 541 <provider selected="true" editor-type-id="text-editor">
494 - <state relative-caret-position="5346">  
495 - <caret line="198" column="16" selection-start-line="198" selection-start-column="16" selection-end-line="198" selection-end-column="16" /> 542 + <state relative-caret-position="2916">
  543 + <caret line="108" column="19" selection-start-line="108" selection-start-column="19" selection-end-line="108" selection-end-column="19" />
496 </state> 544 </state>
497 </provider> 545 </provider>
498 </entry> 546 </entry>
499 - <entry file="file://$PROJECT_DIR$/css/ggbt.css"> 547 + <entry file="file://$PROJECT_DIR$/first.html">
500 <provider selected="true" editor-type-id="text-editor"> 548 <provider selected="true" editor-type-id="text-editor">
501 - <state relative-caret-position="1080">  
502 - <caret line="40" column="28" lean-forward="true" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" /> 549 + <state relative-caret-position="702">
  550 + <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
503 </state> 551 </state>
504 </provider> 552 </provider>
505 </entry> 553 </entry>
506 - <entry file="file://$PROJECT_DIR$/ggbt.html"> 554 + <entry file="file://$PROJECT_DIR$/css/index.css">
507 <provider selected="true" editor-type-id="text-editor"> 555 <provider selected="true" editor-type-id="text-editor">
508 - <state relative-caret-position="729">  
509 - <caret line="36" column="18" lean-forward="true" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" /> 556 + <state relative-caret-position="1728">
  557 + <caret line="64" column="30" selection-start-line="64" selection-start-column="30" selection-end-line="64" selection-end-column="30" />
510 </state> 558 </state>
511 </provider> 559 </provider>
512 </entry> 560 </entry>
513 - <entry file="file://$PROJECT_DIR$/wtfk.html"> 561 + <entry file="file://$PROJECT_DIR$/css/common.css">
514 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
515 - <state relative-caret-position="143">  
516 - <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" /> 563 + <state relative-caret-position="81">
  564 + <caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
517 </state> 565 </state>
518 </provider> 566 </provider>
519 </entry> 567 </entry>
520 - <entry file="file://$PROJECT_DIR$/slxz.html"> 568 + <entry file="file://$PROJECT_DIR$/css/cplb.css">
521 <provider selected="true" editor-type-id="text-editor"> 569 <provider selected="true" editor-type-id="text-editor">
522 - <state relative-caret-position="1998">  
523 - <caret line="74" selection-start-line="74" selection-end-line="74" /> 570 + <state relative-caret-position="135">
  571 + <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="1" />
524 </state> 572 </state>
525 </provider> 573 </provider>
526 </entry> 574 </entry>
527 - <entry file="file://$PROJECT_DIR$/css/wtfk.css"> 575 + <entry file="file://$PROJECT_DIR$/css/cpxq.css">
528 <provider selected="true" editor-type-id="text-editor"> 576 <provider selected="true" editor-type-id="text-editor">
529 - <state relative-caret-position="2565">  
530 - <caret line="95" column="23" lean-forward="true" selection-start-line="95" selection-start-column="23" selection-end-line="95" selection-end-column="23" /> 577 + <state relative-caret-position="54">
  578 + <caret line="2" selection-start-line="2" selection-end-line="6" selection-end-column="1" />
531 </state> 579 </state>
532 </provider> 580 </provider>
533 </entry> 581 </entry>
534 - <entry file="file://$PROJECT_DIR$/iconfont/iconfont.css"> 582 + <entry file="file://$PROJECT_DIR$/ggbt.html">
535 <provider selected="true" editor-type-id="text-editor"> 583 <provider selected="true" editor-type-id="text-editor">
536 - <state relative-caret-position="432">  
537 - <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />  
538 - <folding>  
539 - <element signature="e#257#1171#1" expanded="true" />  
540 - </folding> 584 + <state relative-caret-position="270">
  585 + <caret line="22" column="34" lean-forward="true" selection-start-line="22" selection-start-column="34" selection-end-line="22" selection-end-column="34" />
541 </state> 586 </state>
542 </provider> 587 </provider>
543 </entry> 588 </entry>
544 - <entry file="file://$PROJECT_DIR$/spxq.html"> 589 + <entry file="file://$PROJECT_DIR$/cpxq.html">
545 <provider selected="true" editor-type-id="text-editor"> 590 <provider selected="true" editor-type-id="text-editor">
546 - <state relative-caret-position="1377">  
547 - <caret line="51" selection-start-line="51" selection-end-line="51" /> 591 + <state relative-caret-position="216">
  592 + <caret line="50" column="34" lean-forward="true" selection-start-line="50" selection-start-column="34" selection-end-line="50" selection-end-column="34" />
548 </state> 593 </state>
549 </provider> 594 </provider>
550 </entry> 595 </entry>
551 - <entry file="file://$PROJECT_DIR$/css/first.css"> 596 + <entry file="file://$PROJECT_DIR$/css/slxz.css">
552 <provider selected="true" editor-type-id="text-editor"> 597 <provider selected="true" editor-type-id="text-editor">
553 - <state relative-caret-position="2916">  
554 - <caret line="108" column="19" selection-start-line="108" selection-start-column="19" selection-end-line="108" selection-end-column="19" /> 598 + <state relative-caret-position="216">
  599 + <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
555 </state> 600 </state>
556 </provider> 601 </provider>
557 </entry> 602 </entry>
558 - <entry file="file://$PROJECT_DIR$/first.html"> 603 + <entry file="file://$PROJECT_DIR$/slxz.html">
559 <provider selected="true" editor-type-id="text-editor"> 604 <provider selected="true" editor-type-id="text-editor">
560 - <state relative-caret-position="702">  
561 - <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" /> 605 + <state relative-caret-position="216">
  606 + <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
  607 + <folding>
  608 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  609 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  610 + <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  611 + </folding>
562 </state> 612 </state>
563 </provider> 613 </provider>
564 </entry> 614 </entry>
565 <entry file="file://$PROJECT_DIR$/index.html"> 615 <entry file="file://$PROJECT_DIR$/index.html">
566 <provider selected="true" editor-type-id="text-editor"> 616 <provider selected="true" editor-type-id="text-editor">
567 - <state relative-caret-position="2106">  
568 - <caret line="78" column="39" selection-start-line="78" selection-start-column="39" selection-end-line="78" selection-end-column="39" /> 617 + <state relative-caret-position="324">
  618 + <caret line="12" column="27" lean-forward="true" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
569 </state> 619 </state>
570 </provider> 620 </provider>
571 </entry> 621 </entry>
572 - <entry file="file://$PROJECT_DIR$/css/index.css"> 622 + <entry file="file://$PROJECT_DIR$/css/ggbt.css">
573 <provider selected="true" editor-type-id="text-editor"> 623 <provider selected="true" editor-type-id="text-editor">
574 - <state relative-caret-position="1728">  
575 - <caret line="64" column="30" selection-start-line="64" selection-start-column="30" selection-end-line="64" selection-end-column="30" /> 624 + <state>
  625 + <caret selection-end-line="4" selection-end-column="1" />
576 </state> 626 </state>
577 </provider> 627 </provider>
578 </entry> 628 </entry>
579 - <entry file="file://$PROJECT_DIR$/css/cpgg.css"> 629 + <entry file="file://$PROJECT_DIR$/css/gift.css">
580 <provider selected="true" editor-type-id="text-editor"> 630 <provider selected="true" editor-type-id="text-editor">
581 - <state relative-caret-position="1674">  
582 - <caret line="62" column="27" selection-start-line="62" selection-start-column="27" selection-end-line="62" selection-end-column="27" /> 631 + <state relative-caret-position="324">
  632 + <caret line="12" column="12" lean-forward="true" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
583 </state> 633 </state>
584 </provider> 634 </provider>
585 </entry> 635 </entry>
586 - <entry file="file://$PROJECT_DIR$/cpgg.html"> 636 + <entry file="file://$PROJECT_DIR$/cplb.html">
587 <provider selected="true" editor-type-id="text-editor"> 637 <provider selected="true" editor-type-id="text-editor">
588 - <state relative-caret-position="3240">  
589 - <caret line="120" column="14" selection-start-line="120" selection-start-column="14" selection-end-line="120" selection-end-column="14" /> 638 + <state relative-caret-position="407">
  639 + <caret line="269" column="60" selection-start-line="269" selection-start-column="60" selection-end-line="269" selection-end-column="60" />
  640 + <folding>
  641 + <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  642 + <element signature="n#div#5;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  643 + <element signature="n#div#6;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  644 + <element signature="n#div#7;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  645 + <element signature="n#div#8;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  646 + <element signature="n#div#9;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  647 + <element signature="n#div#10;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  648 + <element signature="n#div#11;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  649 + <element signature="n#div#12;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  650 + <element signature="n#div#13;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  651 + <element signature="n#div#14;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  652 + <element signature="n#div#15;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  653 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  654 + </folding>
590 </state> 655 </state>
591 </provider> 656 </provider>
592 </entry> 657 </entry>
593 - <entry file="file://$PROJECT_DIR$/gift.html"> 658 + <entry file="file://$PROJECT_DIR$/cpgg.html">
594 <provider selected="true" editor-type-id="text-editor"> 659 <provider selected="true" editor-type-id="text-editor">
595 - <state relative-caret-position="476">  
596 - <caret line="140" column="6" lean-forward="true" selection-start-line="140" selection-start-column="6" selection-end-line="140" selection-end-column="6" /> 660 + <state relative-caret-position="208">
  661 + <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
597 <folding> 662 <folding>
598 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 663 + <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  664 + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  665 + <element signature="n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
599 </folding> 666 </folding>
600 </state> 667 </state>
601 </provider> 668 </provider>
602 </entry> 669 </entry>
603 - <entry file="file://$PROJECT_DIR$/css/gift.css"> 670 + <entry file="file://$PROJECT_DIR$/css/cpgg.css">
604 <provider selected="true" editor-type-id="text-editor"> 671 <provider selected="true" editor-type-id="text-editor">
605 - <state relative-caret-position="223">  
606 - <caret line="135" column="1" lean-forward="true" selection-start-line="135" selection-start-column="1" selection-end-line="135" selection-end-column="1" /> 672 + <state relative-caret-position="234">
  673 + <caret line="108" column="23" lean-forward="true" selection-start-line="108" selection-start-column="23" selection-end-line="108" selection-end-column="23" />
  674 + </state>
  675 + </provider>
  676 + </entry>
  677 + <entry file="file://$PROJECT_DIR$/gift.html">
  678 + <provider selected="true" editor-type-id="text-editor">
  679 + <state relative-caret-position="344">
  680 + <caret line="120" column="22" lean-forward="true" selection-start-line="120" selection-start-column="22" selection-end-line="120" selection-end-column="22" />
  681 + <folding>
  682 + <element signature="n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  683 + <element signature="n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  684 + <element signature="n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  685 + <element signature="n#div#3;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  686 + <element signature="n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  687 + <element signature="n#div#0;n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  688 + <element signature="n#div#1;n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  689 + <element signature="n#div#5;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  690 + <element signature="n#div#0;n#div#5;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  691 + <element signature="n#div#6;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  692 + <element signature="n#div#7;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  693 + <element signature="n#div#8;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  694 + <element signature="n#div#9;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  695 + <element signature="n#div#10;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  696 + <element signature="n#div#0;n#div#10;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  697 + <element signature="n#div#1;n#div#10;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  698 + <element signature="n#div#11;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  699 + <element signature="n#div#0;n#div#11;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  700 + </folding>
607 </state> 701 </state>
608 </provider> 702 </provider>
609 </entry> 703 </entry>
@@ -11,46 +11,16 @@ @@ -11,46 +11,16 @@
11 <body> 11 <body>
12 <div class="container"> 12 <div class="container">
13 <div class="home_container"> 13 <div class="home_container">
14 - <!--头部-->  
15 - <!--<div class="top">-->  
16 - <!--<div class="top_img">-->  
17 - <!--<img src="images/fh@2x.png" width="100%">-->  
18 - <!--</div>-->  
19 - <!--<div class="top_text">-->  
20 - <!--商品详情-->  
21 - <!--</div>-->  
22 - <!--</div>--> 14 +
23 <!--主体文字--> 15 <!--主体文字-->
24 <div class="main"> 16 <div class="main">
25 - <div class="box_main"> 17 + <div class="box_main " onclick="btn_sub()">
26 18
27 <!--图片位置，商品名称，价格，库存--> 19 <!--图片位置，商品名称，价格，库存-->
28 - <div class="main_top" onclick="btn_sub()">  
29 - <div class="main_top_left">  
30 - </div>  
31 -  
32 - </div>  
33 - <!--商品描述-->  
34 - <div class="main_bottom">  
35 - <div class="main_bottom_big">  
36 - 商品描述  
37 - </div>  
38 - <div class="main_bottom_small">  
39 - 描述描述描述描述描述描述述述描述描述描述描述描述描述描述描述描述描述描述描述描述描述  
40 - </div>  
41 - <div class="main_bottom_time">  
42 - 2018.1.3  
43 - </div>  
44 - </div> 20 + <div class="main_top" >
  21 + <img class="main_top_left" src="images/banner02@2x.png" width="100%" height="100%">
45 22
46 - <!--box_main结尾-->  
47 - </div>  
48 - <div class="box_main box_main_next">  
49 23
50 - <!--图片位置，商品名称，价格，库存-->  
51 - <div class="main_top">  
52 - <div class="main_top_left">  
53 - </div>  
54 24
55 </div> 25 </div>
56 <!--商品描述--> 26 <!--商品描述-->
@@ -60,51 +30,7 @@ @@ -60,51 +30,7 @@
60 </div> 30 </div>
61 <div class="main_bottom_small"> 31 <div class="main_bottom_small">
62 描述描述描述描述描述描述述述描述描述描述描述描述描述描述描述描述描述描述描述描述描述 32 描述描述描述描述描述描述述述描述描述描述描述描述描述描述描述描述描述描述描述描述描述
63 - </div>  
64 - <div class="main_bottom_time">  
65 - 2018.1.3  
66 - </div>  
67 - </div>  
68 -  
69 - <!--box_main结尾-->  
70 - </div>  
71 - <div class="box_main box_main_next">  
72 -  
73 - <!--图片位置，商品名称，价格，库存-->  
74 - <div class="main_top">  
75 - <div class="main_top_left">  
76 - </div>  
77 -  
78 - </div>  
79 - <!--商品描述-->  
80 - <div class="main_bottom">  
81 - <div class="main_bottom_big">  
82 - 商品描述  
83 - </div>  
84 - <div class="main_bottom_small">  
85 描述描述描述描述描述描述述述描述描述描述描述描述描述描述描述描述描述描述描述描述描述 33 描述描述描述描述描述描述述述描述描述描述描述描述描述描述描述描述描述描述描述描述描述
86 - </div>  
87 - <div class="main_bottom_time">  
88 - 2018.1.3  
89 - </div>  
90 - </div>  
91 -  
92 - <!--box_main结尾-->  
93 - </div>  
94 - <div class="box_main box_main_next">  
95 -  
96 - <!--图片位置，商品名称，价格，库存-->  
97 - <div class="main_top">  
98 - <div class="main_top_left">  
99 - </div>  
100 -  
101 - </div>  
102 - <!--商品描述-->  
103 - <div class="main_bottom">  
104 - <div class="main_bottom_big">  
105 - 商品描述  
106 - </div>  
107 - <div class="main_bottom_small">  
108 描述描述描述描述描述描述述述描述描述描述描述描述描述描述描述描述描述描述描述描述描述 34 描述描述描述描述描述描述述述描述描述描述描述描述描述描述描述描述描述描述描述描述描述
109 </div> 35 </div>
110 <div class="main_bottom_time"> 36 <div class="main_bottom_time">
@@ -112,11 +38,11 @@ @@ -112,11 +38,11 @@
112 </div> 38 </div>
113 </div> 39 </div>
114 40
115 - <!--box_main结尾-->  
116 </div> 41 </div>
117 42
118 43
119 44
  45 +
120 <!--main 结尾--> 46 <!--main 结尾-->
121 </div> 47 </div>
122 </div> 48 </div>
@@ -12,15 +12,7 @@ @@ -12,15 +12,7 @@
12 <body> 12 <body>
13 <div class="container"> 13 <div class="container">
14 <div class="home_container"> 14 <div class="home_container">
15 - <!--头部-->  
16 - <!--<div class="top">-->  
17 - <!--<div class="top_img">-->  
18 - <!--<img src="images/fh@2x.png" width="100%">-->  
19 - <!--</div>-->  
20 - <!--<div class="top_text">-->  
21 - <!--产品列表-->  
22 - <!--</div>-->  
23 - <!--</div>--> 15 +
24 <!--主体文字--> 16 <!--主体文字-->
25 <div class="main"> 17 <div class="main">
26 <div class="main_search"> 18 <div class="main_search">
@@ -35,6 +27,8 @@ @@ -35,6 +27,8 @@
35 <img src="images/me@2x.png" width="100%" height="100%"> 27 <img src="images/me@2x.png" width="100%" height="100%">
36 </div> 28 </div>
37 </div> 29 </div>
  30 +
  31 + <div class="main_items">
38 <div class="main_item" onclick="btn_sub()"> 32 <div class="main_item" onclick="btn_sub()">
39 <div class="main_item_title"> 33 <div class="main_item_title">
40 标题 34 标题
@@ -115,12 +109,61 @@ @@ -115,12 +109,61 @@
115 时间 109 时间
116 </div> 110 </div>
117 </div> 111 </div>
  112 + <div class="main_item">
  113 + <div class="main_item_title">
  114 + 标题
  115 + </div>
  116 + <div class="main_item_time">
  117 + 时间
  118 + </div>
  119 + </div>
  120 + <div class="main_item">
  121 + <div class="main_item_title">
  122 + 标题
  123 + </div>
  124 + <div class="main_item_time">
  125 + 时间
  126 + </div>
  127 + </div>
  128 + <div class="main_item">
  129 + <div class="main_item_title">
  130 + 标题
  131 + </div>
  132 + <div class="main_item_time">
  133 + 时间
  134 + </div>
  135 + </div>
  136 + <div class="main_item">
  137 + <div class="main_item_title">
  138 + 标题
  139 + </div>
  140 + <div class="main_item_time">
  141 + 时间
  142 + </div>
  143 + </div>
  144 + <div class="main_item">
  145 + <div class="main_item_title">
  146 + 标题
  147 + </div>
  148 + <div class="main_item_time">
  149 + 时间
  150 + </div>
  151 + </div>
  152 + <div class="main_item">
  153 + <div class="main_item_title">
  154 + 标题
  155 + </div>
  156 + <div class="main_item_time">
  157 + 时间
  158 + </div>
  159 + </div>
118 160
  161 + </div>
119 162
120 </div> 163 </div>
121 164
122 <!--设置onclick样式--> 165 <!--设置onclick样式-->
123 - <div class="menu_container" style="display: none"> 166 + <div class="menu_container btn_return" style="display: none" >
124 <div class="menu_container_items"> 167 <div class="menu_container_items">
125 <div class="menu_container_top"> 168 <div class="menu_container_top">
126 <p>产品筛选</p> 169 <p>产品筛选</p>
@@ -222,6 +265,14 @@ @@ -222,6 +265,14 @@
222 $(".main_search_menu").css("background","#0A84D9") 265 $(".main_search_menu").css("background","#0A84D9")
223 }) 266 })
224 //页面跳转 267 //页面跳转
  268 + $(".btn_return").click(function () {
  269 + $(this).css("display","none")
  270 + $(".main_search_menu").css("background","#0A84D9")
  271 + })
  272 +
  273 + $(".menu_container_items").click(function(){
  274 + window.event.stopPropagation()
  275 + })
225 276
226 }) 277 })
227 </script> 278 </script>
@@ -11,15 +11,7 @@ @@ -11,15 +11,7 @@
11 <body> 11 <body>
12 <div class="container"> 12 <div class="container">
13 <div class="home_container"> 13 <div class="home_container">
14 - <!--头部-->  
15 - <!--<div class="top">-->  
16 - <!--<div class="top_img">-->  
17 - <!--<img src="images/fh@2x.png" width="100%">-->  
18 - <!--</div>-->  
19 - <!--<div class="top_text">-->  
20 - <!--商品详情-->  
21 - <!--</div>-->  
22 - <!--</div>--> 14 +
23 <!--主体文字--> 15 <!--主体文字-->
24 <div class="main"> 16 <div class="main">
25 <div class="main_title"> 17 <div class="main_title">
@@ -27,8 +19,8 @@ @@ -27,8 +19,8 @@
27 </div> 19 </div>
28 <!--图片位置，商品名称，价格，库存--> 20 <!--图片位置，商品名称，价格，库存-->
29 <div class="main_top" onclick="btn_sub()"> 21 <div class="main_top" onclick="btn_sub()">
30 - <div class="main_top_left">  
31 - </div> 22 + <img class="main_top_left" src="images/banner02@2x.png">
  23 +
32 24
33 </div> 25 </div>
34 <!--商品描述--> 26 <!--商品描述-->
@@ -64,6 +56,7 @@ @@ -64,6 +56,7 @@
64 文档文档文档文档文档文档文档文档文档文档 56 文档文档文档文档文档文档文档文档文档文档
65 文档文档文档文档文档文档文档文档文档文档 57 文档文档文档文档文档文档文档文档文档文档
66 文档文档文档文档文档文档文档文档文档文档 58 文档文档文档文档文档文档文档文档文档文档
  59 +
67 </div> 60 </div>
68 </div> 61 </div>
69 62
1 1
2 -/*body{*/  
3 - /*background: url("../images/bg03@2x.png" );*/  
4 - /*background-size: 100% 100%;*/  
5 -/*}*/ 2 +body{
  3 + background: url("../images/bg03@2x.png" );
  4 + background-size: 100% 100%;
  5 + background-attachment: fixed;
  6 +}
6 .container{ 7 .container{
7 - min-height: 100%; 8 + /*min-height: 100%;*/
8 top: 0; 9 top: 0;
9 right: 0; 10 right: 0;
10 bottom: 0; 11 bottom: 0;
11 left: 0; 12 left: 0;
12 - background: url("../images/bg03@2x.png" );  
13 - background-size: 100% 100%; 13 +
14 } 14 }
15 .home_container{ 15 .home_container{
16 width: 100%; 16 width: 100%;
@@ -55,12 +55,13 @@ @@ -55,12 +55,13 @@
55 /*justify-content: center;*/ 55 /*justify-content: center;*/
56 /*background-color: #ffffff;*/ 56 /*background-color: #ffffff;*/
57 /*flex-flow: column;*/ 57 /*flex-flow: column;*/
58 - margin: 0.4rem auto; 58 + margin: 0 auto;
59 59
60 } 60 }
61 .box_main{ 61 .box_main{
62 background-color: #FFFFFF; 62 background-color: #FFFFFF;
63 border-radius: 0.08rem; 63 border-radius: 0.08rem;
  64 + margin-top: 0.32rem;
64 } 65 }
65 .box_main_next{ 66 .box_main_next{
66 margin-top: 0.32rem; 67 margin-top: 0.32rem;
@@ -73,6 +74,7 @@ @@ -73,6 +74,7 @@
73 font-size: 0.3rem; 74 font-size: 0.3rem;
74 75
75 } 76 }
  77 +
76 .main_top_left{ 78 .main_top_left{
77 width: 6.9rem; 79 width: 6.9rem;
78 height: 3.9rem; 80 height: 3.9rem;
@@ -80,6 +82,9 @@ @@ -80,6 +82,9 @@
80 border-top-left-radius: 0.06rem; 82 border-top-left-radius: 0.06rem;
81 border-top-right-radius: 0.06rem; 83 border-top-right-radius: 0.06rem;
82 } 84 }
  85 +/*.main_top_left img{*/
  86 + /*widows: ;*/
  87 +/*}*/
83 88
84 89
85 .main_bottom{ 90 .main_bottom{
@@ -98,14 +103,12 @@ @@ -98,14 +103,12 @@
98 } 103 }
99 .main_bottom_small{ 104 .main_bottom_small{
100 font-size: 0.26rem; 105 font-size: 0.26rem;
101 - /*margin-left: 0.14rem;*/  
102 margin: 0 0.14rem; 106 margin: 0 0.14rem;
103 - padding-bottom: 0.35rem;  
104 - /*border-bottom: 1px dashed #E64E62;*/  
105 } 107 }
106 .main_bottom_time{ 108 .main_bottom_time{
107 font-size: 0.26rem; 109 font-size: 0.26rem;
108 color: #bbbbbb; 110 color: #bbbbbb;
109 margin-right: 0.16rem; 111 margin-right: 0.16rem;
110 text-align: right; 112 text-align: right;
  113 + padding-bottom: 0.38rem;
111 } 114 }
@@ -3,14 +3,18 @@ @@ -3,14 +3,18 @@
3 /*background: url("../images/bg03@2x.png" );*/ 3 /*background: url("../images/bg03@2x.png" );*/
4 /*background-size: 100% 100%;*/ 4 /*background-size: 100% 100%;*/
5 /*}*/ 5 /*}*/
  6 +body{
  7 + background: url("../images/bg03@2x.png");
  8 + background-size: 100% 100%;
  9 + background-attachment: fixed;
  10 +}
6 .container{ 11 .container{
7 min-height: 100%; 12 min-height: 100%;
8 top: 0; 13 top: 0;
9 right: 0; 14 right: 0;
10 bottom: 0; 15 bottom: 0;
11 left: 0; 16 left: 0;
12 - background: url("../images/bg03@2x.png" );  
13 - background-size: 100% 100%; 17 +
14 } 18 }
15 .home_container{ 19 .home_container{
16 width: 100%; 20 width: 100%;
@@ -60,6 +64,11 @@ @@ -60,6 +64,11 @@
60 background-color: #0A84D9; 64 background-color: #0A84D9;
61 display: flex; 65 display: flex;
62 justify-content: space-around; 66 justify-content: space-around;
  67 + position: fixed;
  68 + top: 0;
  69 + left: 0;
  70 + right: 0;
  71 +
63 } 72 }
64 73
65 .main_search_input{ 74 .main_search_input{
@@ -88,6 +97,7 @@ @@ -88,6 +97,7 @@
88 font-size: 0.32rem; 97 font-size: 0.32rem;
89 /*margin-left: 0.3rem;*/ 98 /*margin-left: 0.3rem;*/
90 padding-left: 0.75rem; 99 padding-left: 0.75rem;
  100 + outline: none;
91 101
92 } 102 }
93 input::-webkit-input-placeholder{ 103 input::-webkit-input-placeholder{
@@ -106,11 +116,15 @@ input::-webkit-input-placeholder{ @@ -106,11 +116,15 @@ input::-webkit-input-placeholder{
106 height: 0.5rem; 116 height: 0.5rem;
107 } 117 }
108 118
  119 +.main_items{
  120 + padding: 1rem 0 0 0;
  121 +
  122 +}
109 .main_item{ 123 .main_item{
110 height: 1.36rem; 124 height: 1.36rem;
111 display: flex; 125 display: flex;
112 flex-flow: column; 126 flex-flow: column;
113 - border-bottom: 1px solid #CCCCCC; 127 + border-bottom: 1px solid #7b7b7b;
114 } 128 }
115 .main_item_title{ 129 .main_item_title{
116 font-size: 0.3rem; 130 font-size: 0.3rem;
@@ -120,7 +134,7 @@ input::-webkit-input-placeholder{ @@ -120,7 +134,7 @@ input::-webkit-input-placeholder{
120 } 134 }
121 .main_item_time{ 135 .main_item_time{
122 font-size: 0.28rem; 136 font-size: 0.28rem;
123 - color: #BBBBBB; 137 + color: #7b7b7b;
124 margin-left: 0.31rem; 138 margin-left: 0.31rem;
125 /*margin-bottom: 0.33rem;*/ 139 /*margin-bottom: 0.33rem;*/
126 } 140 }
1 1
2 -/*body{*/  
3 -/*background: url("../images/bg03@2x.png" );*/  
4 -/*background-size: 100% 100%;*/  
5 -/*}*/ 2 +
  3 +body{
  4 + background: url("../images/bg03@2x.png");
  5 + background-size: 100% 100%;
  6 + background-attachment: fixed;
  7 +}
6 .container{ 8 .container{
7 min-height: 100%; 9 min-height: 100%;
8 top: 0; 10 top: 0;
9 right: 0; 11 right: 0;
10 bottom: 0; 12 bottom: 0;
11 left: 0; 13 left: 0;
12 - background: url("../images/bg03@2x.png" );  
13 - background-size: 100% 100%; 14 +
14 } 15 }
15 .home_container{ 16 .home_container{
16 width: 100%; 17 width: 100%;
@@ -59,7 +60,8 @@ @@ -59,7 +60,8 @@
59 60
60 } 61 }
61 .main_top{ 62 .main_top{
62 - margin: 0.23rem 0.1rem; 63 + height: 3.14rem;
  64 + margin: 0.24rem 0.1rem;
63 display: flex; 65 display: flex;
64 font-size: 0.3rem; 66 font-size: 0.3rem;
65 67
@@ -71,8 +73,8 @@ @@ -71,8 +73,8 @@
71 font-weight: bold; 73 font-weight: bold;
72 } 74 }
73 .main_top_left{ 75 .main_top_left{
74 - width: 6.9rem;  
75 - height: 3.9rem; 76 + width: 100%;
  77 + /*height: 3.9rem;*/
76 background-color: #CCCCCC; 78 background-color: #CCCCCC;
77 border-top-left-radius: 0.06rem; 79 border-top-left-radius: 0.06rem;
78 border-top-right-radius: 0.06rem; 80 border-top-right-radius: 0.06rem;
1 - 1 +body{
  2 + background: url("../images/bg03@2x.png");
  3 + background-size: 100% 100%;
  4 + background-attachment: fixed;
  5 +}
2 .container{ 6 .container{
3 min-height: 100%; 7 min-height: 100%;
4 top: 0; 8 top: 0;
5 right: 0; 9 right: 0;
6 bottom: 0; 10 bottom: 0;
7 left: 0; 11 left: 0;
8 - background: url("../images/bg03@2x.png" );  
9 - background-size: 100% 100%; 12 +
10 } 13 }
11 .home_container{ 14 .home_container{
12 width: 100%; 15 width: 100%;
@@ -60,19 +63,20 @@ @@ -60,19 +63,20 @@
60 /*font-weight: lighter;*/ 63 /*font-weight: lighter;*/
61 } 64 }
62 .main_mid{ 65 .main_mid{
63 - /*margin-top: 0.31rem;*/  
64 - margin: 0.31rem 0.27rem;  
65 - width: 4.36rem; 66 +
  67 + margin: 0.31rem 0;
  68 + width: 6.9rem;
66 display: flex; 69 display: flex;
67 - justify-content: space-between;  
68 font-size: 0.24rem; 70 font-size: 0.24rem;
69 color: #BBBBBB; 71 color: #BBBBBB;
  72 + position: relative;
70 } 73 }
71 .main_author{ 74 .main_author{
72 75
73 } 76 }
74 .main_time{ 77 .main_time{
75 - 78 + position: absolute;
  79 + right: 2.5rem;
76 } 80 }
77 .main_banner{ 81 .main_banner{
78 width: 6.9rem; 82 width: 6.9rem;
1 @import "../iconfont/iconfont.css"; 1 @import "../iconfont/iconfont.css";
  2 +body{
  3 + background: url("../images/bg02@2x.png");
  4 + background-size: 100% 100%;
  5 + background-attachment: fixed;
  6 +}
2 .container{ 7 .container{
3 - /*height: 100%;*/ 8 +
4 min-height: 100%; 9 min-height: 100%;
5 top: 0; 10 top: 0;
6 right: 0; 11 right: 0;
7 bottom: 0; 12 bottom: 0;
8 left: 0; 13 left: 0;
9 - background: url("../images/bg02@2x.png" );  
10 - background-size: 100% 100%; 14 + /*background: url("../images/bg02@2x.png" );*/
  15 + /*background-size: 100% 100%;*/
11 } 16 }
12 .home_container{ 17 .home_container{
13 width: 100%; 18 width: 100%;
@@ -41,25 +46,23 @@ @@ -41,25 +46,23 @@
41 font-size: 0.27rem; 46 font-size: 0.27rem;
42 color: #ffffff; 47 color: #ffffff;
43 } 48 }
44 -/*.banner_title_small{*/  
45 - /*width: ;*/  
46 -/*}*/ 49 +
47 .menu{ 50 .menu{
48 margin-top: 0.12rem; 51 margin-top: 0.12rem;
49 - /*width: 100%;*/ 52 +
50 height: 1.06rem; 53 height: 1.06rem;
51 display: flex; 54 display: flex;
52 justify-content: space-around; 55 justify-content: space-around;
53 background-color: #F3C4CB; 56 background-color: #F3C4CB;
54 font-size: 0.32rem; 57 font-size: 0.32rem;
55 align-items: center; 58 align-items: center;
56 - /*line-height: 1.06rem;*/ 59 +
57 text-decoration: none; 60 text-decoration: none;
58 } 61 }
59 .menu_item{ 62 .menu_item{
60 display: flex; 63 display: flex;
61 align-items: center; 64 align-items: center;
62 - /*padding-bottom: 0.2rem;*/ 65 +
63 position: relative; 66 position: relative;
64 height: 0.8rem; 67 height: 0.8rem;
65 border-bottom:0.04rem solid transparent; 68 border-bottom:0.04rem solid transparent;
@@ -83,23 +86,8 @@ @@ -83,23 +86,8 @@
83 color: #C0394B; 86 color: #C0394B;
84 height:0.7rem; 87 height:0.7rem;
85 border-bottom: 0.04rem solid #C0394B; 88 border-bottom: 0.04rem solid #C0394B;
86 - /*height:1.02rem*/ 89 +
87 } 90 }
88 -/*.menu_sort:before{*/  
89 - /*color: #C0394B;*/  
90 -/*}*/  
91 -/*.menu_sort:after{*/  
92 - /*height:0.04rem;*/  
93 - /*width: 1.25rem;*/  
94 - /*background-color: #C0394B;*/  
95 - /*display: block;*/  
96 - /*content: "";*/  
97 - /*position: absolute;*/  
98 - /*bottom: 0;*/  
99 - /*left:0;*/  
100 - /*right:0;*/  
101 - /*margin: 0 auto;*/  
102 -/*}*/  
103 91
104 .items{ 92 .items{
105 width: 5.7rem; 93 width: 5.7rem;
1 - 1 +body{
  2 + background: url("../images/bg03@2x.png");
  3 + background-size: 100% 100%;
  4 + background-attachment: fixed;
  5 +}
2 6
3 .container{ 7 .container{
4 min-height: 100%; 8 min-height: 100%;
@@ -6,8 +10,7 @@ @@ -6,8 +10,7 @@
6 right: 0; 10 right: 0;
7 bottom: 0; 11 bottom: 0;
8 left: 0; 12 left: 0;
9 - background: url("../images/bg03@2x.png" );  
10 - background-size: 100% 100%; 13 +
11 position: relative; 14 position: relative;
12 } 15 }
13 .home_container{ 16 .home_container{
@@ -11,15 +11,8 @@ @@ -11,15 +11,8 @@
11 <body> 11 <body>
12 <div class="container"> 12 <div class="container">
13 <div class="home_container"> 13 <div class="home_container">
14 - <!--头部-->  
15 - <!--<div class="top">-->  
16 - <!--<div class="top_img">-->  
17 - <!--<img src="images/fh@2x.png" width="100%">-->  
18 - <!--</div>-->  
19 - <!--<div class="top_text">-->  
20 - <!--产品公告-->  
21 - <!--</div>-->  
22 - <!--</div>--> 14 +
  15 +
23 <!--主体文字--> 16 <!--主体文字-->
24 <div class="main"> 17 <div class="main">
25 <!--公告标题--> 18 <!--公告标题-->
@@ -36,9 +29,9 @@ @@ -36,9 +29,9 @@
36 </div> 29 </div>
37 </div> 30 </div>
38 <!--公告框--> 31 <!--公告框-->
39 - <div class="main_banner"> 32 + <img class="main_banner" src="images/banner02@2x.png">
  33 +
40 34
41 - </div>  
42 <!--文本框--> 35 <!--文本框-->
43 <div class="main_text"> 36 <div class="main_text">
44 测试文字测试文字测试文字测试文字测试文字 37 测试文字测试文字测试文字测试文字测试文字
@@ -46,6 +39,18 @@ @@ -46,6 +39,18 @@
46 测试文字测试文字测试文字测试文字测试文字 39 测试文字测试文字测试文字测试文字测试文字
47 测试文字测试文字测试文字测试文字测试文字 40 测试文字测试文字测试文字测试文字测试文字
48 测试文字测试文字测试文字测试文字测试文字 41 测试文字测试文字测试文字测试文字测试文字
  42 + 测试文字测试文字测试文字测试文字测试文字
  43 + 测试文字测试文字测试文字测试文字测试文字
  44 + 测试文字测试文字测试文字测试文字测试文字
  45 + 测试文字测试文字测试文字测试文字测试文字
  46 + 测试文字测试文字测试文字测试文字测试文字
  47 + 测试文字测试文字测试文字测试文字测试文字
  48 + 测试文字测试文字测试文字测试文字测试文字
  49 + 测试文字测试文字测试文字测试文字测试文字
  50 + 测试文字测试文字测试文字测试文字测试文字
  51 + 测试文字测试文字测试文字测试文字测试文字
  52 + 测试文字测试文字测试文字测试文字测试文字
  53 +
49 54
50 55
51 </div> 56 </div>
@@ -133,6 +133,90 @@ @@ -133,6 +133,90 @@
133 </div> 133 </div>
134 </div> 134 </div>
135 </div> 135 </div>
  136 + <div class="item">
  137 + <div class="item_img">
  138 + <img src="images/pic01@2x.png" width="100%" onclick="btn_next()">
  139 + </div>
  140 + <div class="item_text">
  141 + <div class="item_text_intro">
  142 + 小米AI音响mini
  143 + </div>
  144 + <div class="item_text_price">
  145 + <span>$ 217.0</span>
  146 + <span>库存: 10</span>
  147 + </div>
  148 + </div>
  149 + </div>
  150 + <div class="item">
  151 + <div class="item_img">
  152 + <img src="images/pic01@2x.png" width="100%">
  153 + </div>
  154 + <div class="item_text">
  155 + <div class="item_text_intro">
  156 + 小米AI音响mini
  157 + </div>
  158 + <div class="item_text_price">
  159 + <span>$ 217.0</span>
  160 + <span>库存: 10</span>
  161 + </div>
  162 + </div>
  163 + </div>
  164 + <div class="item">
  165 + <div class="item_img">
  166 + <img src="images/pic01@2x.png" width="100%">
  167 + </div>
  168 + <div class="item_text">
  169 + <div class="item_text_intro">
  170 + 小米AI音响mini
  171 + </div>
  172 + <div class="item_text_price">
  173 + <span>$ 217.0</span>
  174 + <span>库存: 10</span>
  175 + </div>
  176 + </div>
  177 + </div>
  178 + <div class="item">
  179 + <div class="item_img">
  180 + <img src="images/pic01@2x.png" width="100%">
  181 + </div>
  182 + <div class="item_text">
  183 + <div class="item_text_intro">
  184 + 小米AI音响mini
  185 + </div>
  186 + <div class="item_text_price">
  187 + <span>$ 217.0</span>
  188 + <span>库存: 10</span>
  189 + </div>
  190 + </div>
  191 + </div>
  192 + <div class="item">
  193 + <div class="item_img">
  194 + <img src="images/pic01@2x.png" width="100%">
  195 + </div>
  196 + <div class="item_text">
  197 + <div class="item_text_intro">
  198 + 小米AI音响mini
  199 + </div>
  200 + <div class="item_text_price">
  201 + <span>$ 217.0</span>
  202 + <span>库存: 10</span>
  203 + </div>
  204 + </div>
  205 + </div>
  206 + <div class="item">
  207 + <div class="item_img">
  208 + <img src="images/pic01@2x.png" width="100%">
  209 + </div>
  210 + <div class="item_text">
  211 + <div class="item_text_intro">
  212 + 小米AI音响mini
  213 + </div>
  214 + <div class="item_text_price">
  215 + <span>$ 217.0</span>
  216 + <span>库存: 10</span>
  217 + </div>
  218 + </div>
  219 + </div>
136 220
137 </div> 221 </div>
138 222
@@ -12,15 +12,7 @@ @@ -12,15 +12,7 @@
12 <body> 12 <body>
13 <div class="container"> 13 <div class="container">
14 <div class="home_container"> 14 <div class="home_container">
15 - <!--头部-->  
16 - <!--<div class="top">-->  
17 - <!--<div class="top_img">-->  
18 - <!--<img src="images/fh@2x.png" width="100%">-->  
19 - <!--</div>-->  
20 - <!--<div class="top_text">-->  
21 - <!--申领须知-->  
22 - <!--</div>-->  
23 - <!--</div>--> 15 +
24 <!--主体文字--> 16 <!--主体文字-->
25 <div class="main"> 17 <div class="main">
26 <div class="main_text"> 18 <div class="main_text">
@@ -73,12 +65,6 @@ @@ -73,12 +65,6 @@
73 $(".btn_box_a").css("background","#0A84D9") 65 $(".btn_box_a").css("background","#0A84D9")
74 }) 66 })
75 67
76 -  
77 -  
78 - // function btn_close() {  
79 - // $('body').removeClass('show_toast');  
80 - // $('.download_container').css('display','none')  
81 - // }  
82 }); 68 });
83 69
84 </script> 70 </script>