fe / ufo-share-act-0606 · Commits

Go to a project

Authored by 邱骏
Commit 9c496a1a95954f4b53cadba7657f363dd7e72450 1 parent a3f21ce1

update

Inline Side-by-side
Showing 1 changed file with 68 additions and 40 deletions
@@ -2,20 +2,7 @@ @@ -2,20 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="54f07507-1869-472d-9df0-58146e96432b" name="Default" comment=""> 4 <list default="true" id="54f07507-1869-472d-9df0-58146e96432b" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/bottom.jpg" afterPath="$PROJECT_DIR$/images/bottom.jpg" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/btn_get.png" afterPath="$PROJECT_DIR$/images/btn_get.png" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/coupons.jpg" afterPath="$PROJECT_DIR$/images/coupons.jpg" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/product_title.jpg" afterPath="$PROJECT_DIR$/images/product_title.jpg" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/repeat_bg.jpg" afterPath="$PROJECT_DIR$/images/repeat_bg.jpg" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/rules.jpg" afterPath="$PROJECT_DIR$/images/rules.jpg" />  
11 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/share.png" afterPath="$PROJECT_DIR$/images/share.png" />  
12 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/title.jpg" afterPath="$PROJECT_DIR$/images/title.jpg" />  
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/share/logo.jpg" afterPath="$PROJECT_DIR$/share/logo.jpg" />  
14 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
15 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />  
16 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/main.js" afterPath="$PROJECT_DIR$/js/main.js" />  
17 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/main.min.js" afterPath="$PROJECT_DIR$/js/main.min.js" />  
18 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/wxshare.js" afterPath="$PROJECT_DIR$/js/wxshare.js" />  
19 </list> 6 </list>
20 <ignored path="$PROJECT_DIR$/.tmp/" /> 7 <ignored path="$PROJECT_DIR$/.tmp/" />
21 <ignored path="$PROJECT_DIR$/temp/" /> 8 <ignored path="$PROJECT_DIR$/temp/" />
@@ -33,7 +20,7 @@ @@ -33,7 +20,7 @@
33 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 20 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
34 <entry file="file://$PROJECT_DIR$/index.html"> 21 <entry file="file://$PROJECT_DIR$/index.html">
35 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
36 - <state relative-caret-position="-240"> 23 + <state relative-caret-position="119">
37 <caret line="7" column="19" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" /> 24 <caret line="7" column="19" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
38 <folding /> 25 <folding />
39 </state> 26 </state>
@@ -43,28 +30,28 @@ @@ -43,28 +30,28 @@
43 <file leaf-file-name="main.css" pinned="false" current-in-tab="false"> 30 <file leaf-file-name="main.css" pinned="false" current-in-tab="false">
44 <entry file="file://$PROJECT_DIR$/css/main.css"> 31 <entry file="file://$PROJECT_DIR$/css/main.css">
45 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
46 - <state relative-caret-position="381"> 33 + <state relative-caret-position="1054">
47 <caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" /> 34 <caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />
48 <folding /> 35 <folding />
49 </state> 36 </state>
50 </provider> 37 </provider>
51 </entry> 38 </entry>
52 </file> 39 </file>
53 - <file leaf-file-name="main.js" pinned="false" current-in-tab="false"> 40 + <file leaf-file-name="main.js" pinned="false" current-in-tab="true">
54 <entry file="file://$PROJECT_DIR$/js/main.js"> 41 <entry file="file://$PROJECT_DIR$/js/main.js">
55 <provider selected="true" editor-type-id="text-editor"> 42 <provider selected="true" editor-type-id="text-editor">
56 - <state relative-caret-position="328">  
57 - <caret line="269" column="29" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="389" selection-end-column="3" /> 43 + <state relative-caret-position="212">
  44 + <caret line="106" column="25" lean-forward="true" selection-start-line="106" selection-start-column="25" selection-end-line="106" selection-end-column="25" />
58 <folding /> 45 <folding />
59 </state> 46 </state>
60 </provider> 47 </provider>
61 </entry> 48 </entry>
62 </file> 49 </file>
63 - <file leaf-file-name="main.min.js" pinned="false" current-in-tab="true"> 50 + <file leaf-file-name="main.min.js" pinned="false" current-in-tab="false">
64 <entry file="file://$PROJECT_DIR$/js/main.min.js"> 51 <entry file="file://$PROJECT_DIR$/js/main.min.js">
65 <provider selected="true" editor-type-id="text-editor"> 52 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="408">  
67 - <caret line="24" column="171" lean-forward="false" selection-start-line="24" selection-start-column="171" selection-end-line="24" selection-end-column="171" /> 53 + <state relative-caret-position="102">
  54 + <caret line="6" column="168" lean-forward="false" selection-start-line="6" selection-start-column="168" selection-end-line="6" selection-end-column="168" />
68 <folding /> 55 <folding />
69 </state> 56 </state>
70 </provider> 57 </provider>
@@ -73,7 +60,7 @@ @@ -73,7 +60,7 @@
73 <file leaf-file-name="wxshare.js" pinned="false" current-in-tab="false"> 60 <file leaf-file-name="wxshare.js" pinned="false" current-in-tab="false">
74 <entry file="file://$PROJECT_DIR$/js/wxshare.js"> 61 <entry file="file://$PROJECT_DIR$/js/wxshare.js">
75 <provider selected="true" editor-type-id="text-editor"> 62 <provider selected="true" editor-type-id="text-editor">
76 - <state relative-caret-position="412"> 63 + <state relative-caret-position="1224">
77 <caret line="72" column="46" lean-forward="false" selection-start-line="72" selection-start-column="46" selection-end-line="72" selection-end-column="46" /> 64 <caret line="72" column="46" lean-forward="false" selection-start-line="72" selection-start-column="46" selection-end-line="72" selection-end-column="46" />
78 <folding /> 65 <folding />
79 </state> 66 </state>
@@ -142,6 +129,7 @@ @@ -142,6 +129,7 @@
142 </navigator> 129 </navigator>
143 <panes> 130 <panes>
144 <pane id="Scratches" /> 131 <pane id="Scratches" />
  132 + <pane id="Scope" />
145 <pane id="ProjectPane"> 133 <pane id="ProjectPane">
146 <subPane> 134 <subPane>
147 <PATH> 135 <PATH>
@@ -230,7 +218,6 @@ @@ -230,7 +218,6 @@
230 </PATH> 218 </PATH>
231 </subPane> 219 </subPane>
232 </pane> 220 </pane>
233 - <pane id="Scope" />  
234 </panes> 221 </panes>
235 </component> 222 </component>
236 <component name="PropertiesComponent"> 223 <component name="PropertiesComponent">
@@ -333,12 +320,14 @@ @@ -333,12 +320,14 @@
333 <option name="presentableId" value="Default" /> 320 <option name="presentableId" value="Default" />
334 <updated>1560302947399</updated> 321 <updated>1560302947399</updated>
335 <workItem from="1560302951031" duration="11920000" /> 322 <workItem from="1560302951031" duration="11920000" />
336 - <workItem from="1560505621419" duration="3172000" /> 323 + <workItem from="1560505621419" duration="3770000" />
  324 + <workItem from="1560671825353" duration="113000" />
  325 + <workItem from="1562053542341" duration="110000" />
337 </task> 326 </task>
338 <servers /> 327 <servers />
339 </component> 328 </component>
340 <component name="TimeTrackingManager"> 329 <component name="TimeTrackingManager">
341 - <option name="totallyTimeSpent" value="15092000" /> 330 + <option name="totallyTimeSpent" value="15913000" />
342 </component> 331 </component>
343 <component name="ToolWindowManager"> 332 <component name="ToolWindowManager">
344 <frame x="243" y="23" width="1374" height="1027" extended-state="0" /> 333 <frame x="243" y="23" width="1374" height="1027" extended-state="0" />
@@ -391,6 +380,46 @@ @@ -391,6 +380,46 @@
391 <component name="editorHistoryManager"> 380 <component name="editorHistoryManager">
392 <entry file="file://$PROJECT_DIR$/index.html"> 381 <entry file="file://$PROJECT_DIR$/index.html">
393 <provider selected="true" editor-type-id="text-editor"> 382 <provider selected="true" editor-type-id="text-editor">
  383 + <state relative-caret-position="119">
  384 + <caret line="7" column="19" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
  385 + <folding />
  386 + </state>
  387 + </provider>
  388 + </entry>
  389 + <entry file="file://$PROJECT_DIR$/css/main.css">
  390 + <provider selected="true" editor-type-id="text-editor">
  391 + <state relative-caret-position="1054">
  392 + <caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />
  393 + <folding />
  394 + </state>
  395 + </provider>
  396 + </entry>
  397 + <entry file="file://$PROJECT_DIR$/js/main.js">
  398 + <provider selected="true" editor-type-id="text-editor">
  399 + <state relative-caret-position="4573">
  400 + <caret line="269" column="29" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="389" selection-end-column="3" />
  401 + <folding />
  402 + </state>
  403 + </provider>
  404 + </entry>
  405 + <entry file="file://$PROJECT_DIR$/js/wxshare.js">
  406 + <provider selected="true" editor-type-id="text-editor">
  407 + <state relative-caret-position="1224">
  408 + <caret line="72" column="46" lean-forward="false" selection-start-line="72" selection-start-column="46" selection-end-line="72" selection-end-column="46" />
  409 + <folding />
  410 + </state>
  411 + </provider>
  412 + </entry>
  413 + <entry file="file://$PROJECT_DIR$/js/main.min.js">
  414 + <provider selected="true" editor-type-id="text-editor">
  415 + <state relative-caret-position="408">
  416 + <caret line="24" column="171" lean-forward="false" selection-start-line="24" selection-start-column="171" selection-end-line="24" selection-end-column="171" />
  417 + <folding />
  418 + </state>
  419 + </provider>
  420 + </entry>
  421 + <entry file="file://$PROJECT_DIR$/index.html">
  422 + <provider selected="true" editor-type-id="text-editor">
394 <state relative-caret-position="0"> 423 <state relative-caret-position="0">
395 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 424 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
396 <folding /> 425 <folding />
@@ -439,50 +468,49 @@ @@ -439,50 +468,49 @@
439 <state /> 468 <state />
440 </provider> 469 </provider>
441 </entry> 470 </entry>
442 - <entry file="file://$PROJECT_DIR$/css/main.css"> 471 + <entry file="file://$PROJECT_DIR$/js/product.js">
443 <provider selected="true" editor-type-id="text-editor"> 472 <provider selected="true" editor-type-id="text-editor">
444 - <state relative-caret-position="381">  
445 - <caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />  
446 - <folding /> 473 + <state relative-caret-position="0">
  474 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
447 </state> 475 </state>
448 </provider> 476 </provider>
449 </entry> 477 </entry>
450 <entry file="file://$PROJECT_DIR$/index.html"> 478 <entry file="file://$PROJECT_DIR$/index.html">
451 <provider selected="true" editor-type-id="text-editor"> 479 <provider selected="true" editor-type-id="text-editor">
452 - <state relative-caret-position="-240"> 480 + <state relative-caret-position="119">
453 <caret line="7" column="19" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" /> 481 <caret line="7" column="19" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
454 <folding /> 482 <folding />
455 </state> 483 </state>
456 </provider> 484 </provider>
457 </entry> 485 </entry>
458 - <entry file="file://$PROJECT_DIR$/js/product.js"> 486 + <entry file="file://$PROJECT_DIR$/css/main.css">
459 <provider selected="true" editor-type-id="text-editor"> 487 <provider selected="true" editor-type-id="text-editor">
460 - <state relative-caret-position="0">  
461 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 488 + <state relative-caret-position="1054">
  489 + <caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />
462 <folding /> 490 <folding />
463 </state> 491 </state>
464 </provider> 492 </provider>
465 </entry> 493 </entry>
466 <entry file="file://$PROJECT_DIR$/js/wxshare.js"> 494 <entry file="file://$PROJECT_DIR$/js/wxshare.js">
467 <provider selected="true" editor-type-id="text-editor"> 495 <provider selected="true" editor-type-id="text-editor">
468 - <state relative-caret-position="412"> 496 + <state relative-caret-position="1224">
469 <caret line="72" column="46" lean-forward="false" selection-start-line="72" selection-start-column="46" selection-end-line="72" selection-end-column="46" /> 497 <caret line="72" column="46" lean-forward="false" selection-start-line="72" selection-start-column="46" selection-end-line="72" selection-end-column="46" />
470 <folding /> 498 <folding />
471 </state> 499 </state>
472 </provider> 500 </provider>
473 </entry> 501 </entry>
474 - <entry file="file://$PROJECT_DIR$/js/main.js"> 502 + <entry file="file://$PROJECT_DIR$/js/main.min.js">
475 <provider selected="true" editor-type-id="text-editor"> 503 <provider selected="true" editor-type-id="text-editor">
476 - <state relative-caret-position="328">  
477 - <caret line="269" column="29" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="389" selection-end-column="3" /> 504 + <state relative-caret-position="102">
  505 + <caret line="6" column="168" lean-forward="false" selection-start-line="6" selection-start-column="168" selection-end-line="6" selection-end-column="168" />
478 <folding /> 506 <folding />
479 </state> 507 </state>
480 </provider> 508 </provider>
481 </entry> 509 </entry>
482 - <entry file="file://$PROJECT_DIR$/js/main.min.js"> 510 + <entry file="file://$PROJECT_DIR$/js/main.js">
483 <provider selected="true" editor-type-id="text-editor"> 511 <provider selected="true" editor-type-id="text-editor">
484 - <state relative-caret-position="408">  
485 - <caret line="24" column="171" lean-forward="false" selection-start-line="24" selection-start-column="171" selection-end-line="24" selection-end-column="171" /> 512 + <state relative-caret-position="212">
  513 + <caret line="106" column="25" lean-forward="true" selection-start-line="106" selection-start-column="25" selection-end-line="106" selection-end-column="25" />
486 <folding /> 514 <folding />
487 </state> 515 </state>
488 </provider> 516 </provider>