Commit 1814efdfa71bb3dea4334bc8642f4764017113fe

Authored by maoyangou
1 parent 0e7694da

add new address

.DS_Store
No preview for this file type
.idea/workspace.xml
@@ -2,8 +2,10 @@ @@ -2,8 +2,10 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment=""> 4 <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/home.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/home.css" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" /> 5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/pay.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/pay.css" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7 </list> 9 </list>
8 <ignored path="patent.iws" /> 10 <ignored path="patent.iws" />
9 <ignored path=".idea/workspace.xml" /> 11 <ignored path=".idea/workspace.xml" />
@@ -26,21 +28,98 @@ @@ -26,21 +28,98 @@
26 </component> 28 </component>
27 <component name="FileEditorManager"> 29 <component name="FileEditorManager">
28 <leaf> 30 <leaf>
29 - <file leaf-file-name="home.css" pinned="false" current-in-tab="true">  
30 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> 31 + <file leaf-file-name="header.jsp" pinned="false" current-in-tab="false">
  32 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
31 <provider selected="true" editor-type-id="text-editor"> 33 <provider selected="true" editor-type-id="text-editor">
32 - <state vertical-scroll-proportion="0.97727275">  
33 - <caret line="103" column="1" selection-start-line="103" selection-start-column="1" selection-end-line="103" selection-end-column="1" /> 34 + <state vertical-scroll-proportion="-5.0">
  35 + <caret line="8" column="55" selection-start-line="8" selection-start-column="55" selection-end-line="8" selection-end-column="55" />
34 <folding /> 36 <folding />
35 </state> 37 </state>
36 </provider> 38 </provider>
37 </entry> 39 </entry>
38 </file> 40 </file>
39 - <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false">  
40 - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 41 + <file leaf-file-name="footer.jsp" pinned="false" current-in-tab="false">
  42 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp">
41 <provider selected="true" editor-type-id="text-editor"> 43 <provider selected="true" editor-type-id="text-editor">
42 - <state vertical-scroll-proportion="-5.8039217">  
43 - <caret line="43" column="28" selection-start-line="43" selection-start-column="28" selection-end-line="43" selection-end-column="28" /> 44 + <state vertical-scroll-proportion="-5.0">
  45 + <caret line="8" column="48" selection-start-line="8" selection-start-column="48" selection-end-line="8" selection-end-column="48" />
  46 + <folding />
  47 + </state>
  48 + </provider>
  49 + </entry>
  50 + </file>
  51 + <file leaf-file-name="logo.png" pinned="false" current-in-tab="false">
  52 + <entry file="file://$PROJECT_DIR$/src/main/webapp/img/logo.png">
  53 + <provider selected="true" editor-type-id="images">
  54 + <state />
  55 + </provider>
  56 + </entry>
  57 + </file>
  58 + <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  60 + <provider selected="true" editor-type-id="text-editor">
  61 + <state vertical-scroll-proportion="0.0">
  62 + <caret line="52" column="3" selection-start-line="52" selection-start-column="3" selection-end-line="52" selection-end-column="3" />
  63 + <folding />
  64 + </state>
  65 + </provider>
  66 + </entry>
  67 + </file>
  68 + <file leaf-file-name="customer_contact.jsp" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp">
  70 + <provider selected="true" editor-type-id="text-editor">
  71 + <state vertical-scroll-proportion="-22.333334">
  72 + <caret line="82" column="15" selection-start-line="82" selection-start-column="15" selection-end-line="82" selection-end-column="15" />
  73 + <folding />
  74 + </state>
  75 + </provider>
  76 + </entry>
  77 + </file>
  78 + <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="true">
  79 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  80 + <provider selected="true" editor-type-id="text-editor">
  81 + <state vertical-scroll-proportion="1.9126016">
  82 + <caret line="191" column="20" selection-start-line="191" selection-start-column="20" selection-end-line="191" selection-end-column="20" />
  83 + <folding />
  84 + </state>
  85 + </provider>
  86 + </entry>
  87 + </file>
  88 + <file leaf-file-name="pay.css" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">
  90 + <provider selected="true" editor-type-id="text-editor">
  91 + <state vertical-scroll-proportion="0.0">
  92 + <caret line="338" column="12" selection-start-line="338" selection-start-column="12" selection-end-line="338" selection-end-column="12" />
  93 + <folding />
  94 + </state>
  95 + </provider>
  96 + </entry>
  97 + </file>
  98 + <file leaf-file-name="case_detail.jsp" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
  100 + <provider selected="true" editor-type-id="text-editor">
  101 + <state vertical-scroll-proportion="-5.625">
  102 + <caret line="9" column="32" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="54" />
  103 + <folding />
  104 + </state>
  105 + </provider>
  106 + </entry>
  107 + </file>
  108 + <file leaf-file-name="case_manage.jsp" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
  110 + <provider selected="true" editor-type-id="text-editor">
  111 + <state vertical-scroll-proportion="-3.75">
  112 + <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="71" />
  113 + <folding />
  114 + </state>
  115 + </provider>
  116 + </entry>
  117 + </file>
  118 + <file leaf-file-name="footer.css" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css">
  120 + <provider selected="true" editor-type-id="text-editor">
  121 + <state vertical-scroll-proportion="0.0">
  122 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
44 <folding /> 123 <folding />
45 </state> 124 </state>
46 </provider> 125 </provider>
@@ -70,8 +149,6 @@ @@ -70,8 +149,6 @@
70 <component name="IdeDocumentHistory"> 149 <component name="IdeDocumentHistory">
71 <option name="CHANGED_PATHS"> 150 <option name="CHANGED_PATHS">
72 <list> 151 <list>
73 - <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" />  
74 - <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" />  
75 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" /> 152 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" />
76 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" /> 153 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" />
77 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" /> 154 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" />
@@ -102,7 +179,6 @@ @@ -102,7 +179,6 @@
102 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" /> 179 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
103 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" /> 180 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
104 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" /> 181 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
105 - <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />  
106 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" /> 182 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
107 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" /> 183 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
108 <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" /> 184 <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
@@ -121,6 +197,9 @@ @@ -121,6 +197,9 @@
121 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" /> 197 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />
122 <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" /> 198 <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
123 <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" /> 199 <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" />
  200 + <option value="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" />
  201 + <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
  202 + <option value="$PROJECT_DIR$/src/main/webapp/css/pay.css" />
124 </list> 203 </list>
125 </option> 204 </option>
126 </component> 205 </component>
@@ -203,9 +282,10 @@ @@ -203,9 +282,10 @@
203 <order /> 282 <order />
204 </component> 283 </component>
205 <component name="ProjectFrameBounds"> 284 <component name="ProjectFrameBounds">
  285 + <option name="x" value="1280" />
206 <option name="y" value="23" /> 286 <option name="y" value="23" />
207 - <option name="width" value="1280" />  
208 - <option name="height" value="737" /> 287 + <option name="width" value="1920" />
  288 + <option name="height" value="1057" />
209 </component> 289 </component>
210 <component name="ProjectLevelVcsManager" settingsEditedManually="false"> 290 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
211 <OptionsSetting value="true" id="Add" /> 291 <OptionsSetting value="true" id="Add" />
@@ -230,7 +310,6 @@ @@ -230,7 +310,6 @@
230 <sortByType /> 310 <sortByType />
231 </navigator> 311 </navigator>
232 <panes> 312 <panes>
233 - <pane id="Scratches" />  
234 <pane id="ProjectPane"> 313 <pane id="ProjectPane">
235 <subPane> 314 <subPane>
236 <PATH> 315 <PATH>
@@ -280,33 +359,12 @@ @@ -280,33 +359,12 @@
280 <option name="myItemId" value="main" /> 359 <option name="myItemId" value="main" />
281 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 360 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
282 </PATH_ELEMENT> 361 </PATH_ELEMENT>
283 - <PATH_ELEMENT>  
284 - <option name="myItemId" value="webapp" />  
285 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
286 - </PATH_ELEMENT>  
287 - </PATH>  
288 - <PATH>  
289 - <PATH_ELEMENT>  
290 - <option name="myItemId" value="patent" />  
291 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
292 - </PATH_ELEMENT>  
293 - <PATH_ELEMENT>  
294 - <option name="myItemId" value="canrd-patent" />  
295 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
296 - </PATH_ELEMENT>  
297 - <PATH_ELEMENT>  
298 - <option name="myItemId" value="src" />  
299 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
300 - </PATH_ELEMENT>  
301 - <PATH_ELEMENT>  
302 - <option name="myItemId" value="main" />  
303 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
304 - </PATH_ELEMENT>  
305 </PATH> 362 </PATH>
306 </subPane> 363 </subPane>
307 </pane> 364 </pane>
308 - <pane id="Scope" />  
309 <pane id="PackagesPane" /> 365 <pane id="PackagesPane" />
  366 + <pane id="Scope" />
  367 + <pane id="Scratches" />
310 </panes> 368 </panes>
311 </component> 369 </component>
312 <component name="PropertiesComponent"> 370 <component name="PropertiesComponent">
@@ -332,9 +390,9 @@ @@ -332,9 +390,9 @@
332 <recent name="com.canrd.patent.web" /> 390 <recent name="com.canrd.patent.web" />
333 </key> 391 </key>
334 <key name="CopyFile.RECENT_KEYS"> 392 <key name="CopyFile.RECENT_KEYS">
  393 + <recent name="$PROJECT_DIR$/src/main/webapp" />
335 <recent name="$PROJECT_DIR$/src/main/webapp/include" /> 394 <recent name="$PROJECT_DIR$/src/main/webapp/include" />
336 <recent name="$PROJECT_DIR$/src/main/webapp/css" /> 395 <recent name="$PROJECT_DIR$/src/main/webapp/css" />
337 - <recent name="$PROJECT_DIR$/src/main/webapp" />  
338 </key> 396 </key>
339 <key name="MoveFile.RECENT_KEYS"> 397 <key name="MoveFile.RECENT_KEYS">
340 <recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" /> 398 <recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" />
@@ -796,36 +854,39 @@ @@ -796,36 +854,39 @@
796 <workItem from="1469243959439" duration="3683000" /> 854 <workItem from="1469243959439" duration="3683000" />
797 <workItem from="1469260205882" duration="12837000" /> 855 <workItem from="1469260205882" duration="12837000" />
798 <workItem from="1469585749367" duration="1353000" /> 856 <workItem from="1469585749367" duration="1353000" />
799 - <workItem from="1469889447244" duration="6184000" /> 857 + <workItem from="1469889447244" duration="6443000" />
  858 + <workItem from="1470021636578" duration="1324000" />
  859 + <workItem from="1470843908935" duration="3000" />
  860 + <workItem from="1471188294361" duration="6145000" />
800 </task> 861 </task>
801 <servers /> 862 <servers />
802 </component> 863 </component>
803 <component name="TimeTrackingManager"> 864 <component name="TimeTrackingManager">
804 - <option name="totallyTimeSpent" value="101912000" /> 865 + <option name="totallyTimeSpent" value="109643000" />
805 </component> 866 </component>
806 <component name="ToolWindowManager"> 867 <component name="ToolWindowManager">
807 - <frame x="0" y="23" width="1280" height="737" extended-state="6" />  
808 - <editor active="true" /> 868 + <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
  869 + <editor active="false" />
809 <layout> 870 <layout>
810 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 871 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
811 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 872 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
812 <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 873 <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
813 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55129534" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 874 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.43626943" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
814 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 875 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
815 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 876 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
816 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 877 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
817 <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 878 <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
818 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.36899224" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 879 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.54196894" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
819 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 880 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
820 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 881 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
821 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 882 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
822 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4496124" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 883 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4496124" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
823 - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 884 + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15867944" sideWeight="0.21691176" order="2" side_tool="true" content_ui="tabs" />
824 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 885 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
825 <window_info id="Structure" active="false" anchor="left" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 886 <window_info id="Structure" active="false" anchor="left" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
826 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1914378" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 887 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1914378" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
827 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 888 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
828 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14378029" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 889 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15867944" sideWeight="0.7830882" order="0" side_tool="false" content_ui="combo" />
829 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 890 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
830 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 891 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
831 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 892 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -844,7 +905,7 @@ @@ -844,7 +905,7 @@
844 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> 905 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
845 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 906 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
846 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> 907 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
847 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19951534" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 908 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14297253" sideWeight="0.784375" order="0" side_tool="false" content_ui="combo" />
848 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 909 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
849 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 910 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
850 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 911 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -853,12 +914,12 @@ @@ -853,12 +914,12 @@
853 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55129534" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> 914 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55129534" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
854 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 915 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
855 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 916 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
856 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26666668" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 917 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36891192" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
857 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" /> 918 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
858 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4496124" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> 919 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4496124" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
859 - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />  
860 - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
861 - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1914378" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 920 + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14297253" sideWeight="0.215625" order="5" side_tool="true" content_ui="tabs" />
  921 + <window_info id="Structure" active="false" anchor="left" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  922 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1914378" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
862 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 923 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
863 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 924 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
864 </layout-to-restore> 925 </layout-to-restore>
@@ -885,43 +946,6 @@ @@ -885,43 +946,6 @@
885 <option name="FILTER_TARGETS" value="false" /> 946 <option name="FILTER_TARGETS" value="false" />
886 </component> 947 </component>
887 <component name="editorHistoryManager"> 948 <component name="editorHistoryManager">
888 - <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc">  
889 - <provider selected="true" editor-type-id="text-editor">  
890 - <state vertical-scroll-proportion="0.0">  
891 - <caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />  
892 - <folding />  
893 - </state>  
894 - </provider>  
895 - </entry>  
896 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">  
897 - <provider selected="true" editor-type-id="text-editor">  
898 - <state vertical-scroll-proportion="0.0">  
899 - <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />  
900 - </state>  
901 - </provider>  
902 - </entry>  
903 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml">  
904 - <provider selected="true" editor-type-id="text-editor">  
905 - <state vertical-scroll-proportion="0.0">  
906 - <caret line="181" column="20" selection-start-line="181" selection-start-column="20" selection-end-line="181" selection-end-column="20" />  
907 - </state>  
908 - </provider>  
909 - </entry>  
910 - <entry file="file://$PROJECT_DIR$/src/main/resources.local/logback.xml">  
911 - <provider selected="true" editor-type-id="text-editor">  
912 - <state vertical-scroll-proportion="-6.111111">  
913 - <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />  
914 - <folding />  
915 - </state>  
916 - </provider>  
917 - </entry>  
918 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java">  
919 - <provider selected="true" editor-type-id="text-editor">  
920 - <state vertical-scroll-proportion="0.0">  
921 - <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />  
922 - </state>  
923 - </provider>  
924 - </entry>  
925 <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java"> 949 <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
926 <provider selected="true" editor-type-id="text-editor"> 950 <provider selected="true" editor-type-id="text-editor">
927 <state vertical-scroll-proportion="0.0"> 951 <state vertical-scroll-proportion="0.0">
@@ -950,14 +974,6 @@ @@ -950,14 +974,6 @@
950 </state> 974 </state>
951 </provider> 975 </provider>
952 </entry> 976 </entry>
953 - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">  
954 - <provider selected="true" editor-type-id="text-editor">  
955 - <state vertical-scroll-proportion="0.0">  
956 - <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />  
957 - <folding />  
958 - </state>  
959 - </provider>  
960 - </entry>  
961 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java"> 977 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java">
962 <provider selected="true" editor-type-id="text-editor"> 978 <provider selected="true" editor-type-id="text-editor">
963 <state vertical-scroll-proportion="0.0"> 979 <state vertical-scroll-proportion="0.0">
@@ -1028,20 +1044,6 @@ @@ -1028,20 +1044,6 @@
1028 </state> 1044 </state>
1029 </provider> 1045 </provider>
1030 </entry> 1046 </entry>
1031 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css">  
1032 - <provider selected="true" editor-type-id="text-editor">  
1033 - <state vertical-scroll-proportion="-1.1945702">  
1034 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1035 - </state>  
1036 - </provider>  
1037 - </entry>  
1038 - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">  
1039 - <provider selected="true" editor-type-id="text-editor">  
1040 - <state vertical-scroll-proportion="-5.0">  
1041 - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />  
1042 - </state>  
1043 - </provider>  
1044 - </entry>  
1045 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java"> 1047 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1046 <provider selected="true" editor-type-id="text-editor"> 1048 <provider selected="true" editor-type-id="text-editor">
1047 <state vertical-scroll-proportion="0.0"> 1049 <state vertical-scroll-proportion="0.0">
@@ -1091,20 +1093,6 @@ @@ -1091,20 +1093,6 @@
1091 </state> 1093 </state>
1092 </provider> 1094 </provider>
1093 </entry> 1095 </entry>
1094 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">  
1095 - <provider selected="true" editor-type-id="text-editor">  
1096 - <state vertical-scroll-proportion="0.0">  
1097 - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" />  
1098 - </state>  
1099 - </provider>  
1100 - </entry>  
1101 - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">  
1102 - <provider selected="true" editor-type-id="text-editor">  
1103 - <state vertical-scroll-proportion="58.75">  
1104 - <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />  
1105 - </state>  
1106 - </provider>  
1107 - </entry>  
1108 <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp"> 1096 <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
1109 <provider selected="true" editor-type-id="text-editor"> 1097 <provider selected="true" editor-type-id="text-editor">
1110 <state vertical-scroll-proportion="-12.5"> 1098 <state vertical-scroll-proportion="-12.5">
@@ -1112,13 +1100,6 @@ @@ -1112,13 +1100,6 @@
1112 </state> 1100 </state>
1113 </provider> 1101 </provider>
1114 </entry> 1102 </entry>
1115 - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">  
1116 - <provider selected="true" editor-type-id="text-editor">  
1117 - <state vertical-scroll-proportion="-3.75">  
1118 - <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />  
1119 - </state>  
1120 - </provider>  
1121 - </entry>  
1122 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css"> 1103 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css">
1123 <provider selected="true" editor-type-id="text-editor"> 1104 <provider selected="true" editor-type-id="text-editor">
1124 <state vertical-scroll-proportion="0.0"> 1105 <state vertical-scroll-proportion="0.0">
@@ -1126,13 +1107,6 @@ @@ -1126,13 +1107,6 @@
1126 </state> 1107 </state>
1127 </provider> 1108 </provider>
1128 </entry> 1109 </entry>
1129 - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">  
1130 - <provider selected="true" editor-type-id="text-editor">  
1131 - <state vertical-scroll-proportion="0.9375">  
1132 - <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />  
1133 - </state>  
1134 - </provider>  
1135 - </entry>  
1136 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp"> 1110 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
1137 <provider selected="true" editor-type-id="text-editor"> 1111 <provider selected="true" editor-type-id="text-editor">
1138 <state vertical-scroll-proportion="0.8238636"> 1112 <state vertical-scroll-proportion="0.8238636">
@@ -1183,7 +1157,6 @@ @@ -1183,7 +1157,6 @@
1183 <provider selected="true" editor-type-id="text-editor"> 1157 <provider selected="true" editor-type-id="text-editor">
1184 <state vertical-scroll-proportion="0.0"> 1158 <state vertical-scroll-proportion="0.0">
1185 <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> 1159 <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
1186 - <folding />  
1187 </state> 1160 </state>
1188 </provider> 1161 </provider>
1189 </entry> 1162 </entry>
@@ -1191,7 +1164,6 @@ @@ -1191,7 +1164,6 @@
1191 <provider selected="true" editor-type-id="text-editor"> 1164 <provider selected="true" editor-type-id="text-editor">
1192 <state vertical-scroll-proportion="0.0"> 1165 <state vertical-scroll-proportion="0.0">
1193 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> 1166 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
1194 - <folding />  
1195 </state> 1167 </state>
1196 </provider> 1168 </provider>
1197 </entry> 1169 </entry>
@@ -1199,7 +1171,6 @@ @@ -1199,7 +1171,6 @@
1199 <provider selected="true" editor-type-id="text-editor"> 1171 <provider selected="true" editor-type-id="text-editor">
1200 <state vertical-scroll-proportion="0.0"> 1172 <state vertical-scroll-proportion="0.0">
1201 <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" /> 1173 <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
1202 - <folding />  
1203 </state> 1174 </state>
1204 </provider> 1175 </provider>
1205 </entry> 1176 </entry>
@@ -1207,7 +1178,6 @@ @@ -1207,7 +1178,6 @@
1207 <provider selected="true" editor-type-id="text-editor"> 1178 <provider selected="true" editor-type-id="text-editor">
1208 <state vertical-scroll-proportion="0.0"> 1179 <state vertical-scroll-proportion="0.0">
1209 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1180 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1210 - <folding />  
1211 </state> 1181 </state>
1212 </provider> 1182 </provider>
1213 </entry> 1183 </entry>
@@ -1215,30 +1185,119 @@ @@ -1215,30 +1185,119 @@
1215 <provider selected="true" editor-type-id="text-editor"> 1185 <provider selected="true" editor-type-id="text-editor">
1216 <state vertical-scroll-proportion="0.0"> 1186 <state vertical-scroll-proportion="0.0">
1217 <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" /> 1187 <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" />
1218 - <folding /> 1188 + </state>
  1189 + </provider>
  1190 + </entry>
  1191 + <entry file="file://$PROJECT_DIR$/.gitignore">
  1192 + <provider selected="true" editor-type-id="text-editor">
  1193 + <state vertical-scroll-proportion="0.32967034">
  1194 + <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
  1195 + </state>
  1196 + </provider>
  1197 + </entry>
  1198 + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
  1199 + <provider selected="true" editor-type-id="text-editor">
  1200 + <state vertical-scroll-proportion="0.0">
  1201 + <caret line="43" column="28" selection-start-line="43" selection-start-column="28" selection-end-line="43" selection-end-column="28" />
  1202 + </state>
  1203 + </provider>
  1204 + </entry>
  1205 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
  1206 + <provider selected="true" editor-type-id="text-editor">
  1207 + <state vertical-scroll-proportion="0.51974386">
  1208 + <caret line="79" column="24" selection-start-line="79" selection-start-column="24" selection-end-line="79" selection-end-column="24" />
1219 </state> 1209 </state>
1220 </provider> 1210 </provider>
1221 </entry> 1211 </entry>
1222 <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> 1212 <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
1223 <provider selected="true" editor-type-id="text-editor"> 1213 <provider selected="true" editor-type-id="text-editor">
  1214 + <state vertical-scroll-proportion="-6.25">
  1215 + <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
  1216 + <folding />
  1217 + </state>
  1218 + </provider>
  1219 + </entry>
  1220 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">
  1221 + <provider selected="true" editor-type-id="text-editor">
1224 <state vertical-scroll-proportion="0.0"> 1222 <state vertical-scroll-proportion="0.0">
1225 - <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" /> 1223 + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" />
1226 <folding /> 1224 <folding />
1227 </state> 1225 </state>
1228 </provider> 1226 </provider>
1229 </entry> 1227 </entry>
1230 - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 1228 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp">
1231 <provider selected="true" editor-type-id="text-editor"> 1229 <provider selected="true" editor-type-id="text-editor">
1232 - <state vertical-scroll-proportion="-5.8039217">  
1233 - <caret line="43" column="28" selection-start-line="43" selection-start-column="28" selection-end-line="43" selection-end-column="28" /> 1230 + <state vertical-scroll-proportion="-5.0">
  1231 + <caret line="8" column="48" selection-start-line="8" selection-start-column="48" selection-end-line="8" selection-end-column="48" />
1234 <folding /> 1232 <folding />
1235 </state> 1233 </state>
1236 </provider> 1234 </provider>
1237 </entry> 1235 </entry>
1238 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> 1236 + <entry file="file://$PROJECT_DIR$/src/main/webapp/img/logo.png">
  1237 + <provider selected="true" editor-type-id="images">
  1238 + <state />
  1239 + </provider>
  1240 + </entry>
  1241 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  1242 + <provider selected="true" editor-type-id="text-editor">
  1243 + <state vertical-scroll-proportion="0.0">
  1244 + <caret line="52" column="3" selection-start-line="52" selection-start-column="3" selection-end-line="52" selection-end-column="3" />
  1245 + <folding />
  1246 + </state>
  1247 + </provider>
  1248 + </entry>
  1249 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
  1250 + <provider selected="true" editor-type-id="text-editor">
  1251 + <state vertical-scroll-proportion="-3.75">
  1252 + <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="71" />
  1253 + <folding />
  1254 + </state>
  1255 + </provider>
  1256 + </entry>
  1257 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
  1258 + <provider selected="true" editor-type-id="text-editor">
  1259 + <state vertical-scroll-proportion="-5.625">
  1260 + <caret line="9" column="32" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="54" />
  1261 + <folding />
  1262 + </state>
  1263 + </provider>
  1264 + </entry>
  1265 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
  1266 + <provider selected="true" editor-type-id="text-editor">
  1267 + <state vertical-scroll-proportion="-5.0">
  1268 + <caret line="8" column="55" selection-start-line="8" selection-start-column="55" selection-end-line="8" selection-end-column="55" />
  1269 + <folding />
  1270 + </state>
  1271 + </provider>
  1272 + </entry>
  1273 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css">
  1274 + <provider selected="true" editor-type-id="text-editor">
  1275 + <state vertical-scroll-proportion="0.0">
  1276 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1277 + <folding />
  1278 + </state>
  1279 + </provider>
  1280 + </entry>
  1281 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">
  1282 + <provider selected="true" editor-type-id="text-editor">
  1283 + <state vertical-scroll-proportion="0.0">
  1284 + <caret line="338" column="12" selection-start-line="338" selection-start-column="12" selection-end-line="338" selection-end-column="12" />
  1285 + <folding />
  1286 + </state>
  1287 + </provider>
  1288 + </entry>
  1289 + <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp">
  1290 + <provider selected="true" editor-type-id="text-editor">
  1291 + <state vertical-scroll-proportion="-22.333334">
  1292 + <caret line="82" column="15" selection-start-line="82" selection-start-column="15" selection-end-line="82" selection-end-column="15" />
  1293 + <folding />
  1294 + </state>
  1295 + </provider>
  1296 + </entry>
  1297 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1239 <provider selected="true" editor-type-id="text-editor"> 1298 <provider selected="true" editor-type-id="text-editor">
1240 - <state vertical-scroll-proportion="0.97727275">  
1241 - <caret line="103" column="1" selection-start-line="103" selection-start-column="1" selection-end-line="103" selection-end-column="1" /> 1299 + <state vertical-scroll-proportion="1.9126016">
  1300 + <caret line="191" column="20" selection-start-line="191" selection-start-column="20" selection-end-line="191" selection-end-column="20" />
1242 <folding /> 1301 <folding />
1243 </state> 1302 </state>
1244 </provider> 1303 </provider>
src/.DS_Store
No preview for this file type
src/main/.DS_Store
No preview for this file type
src/main/webapp/.DS_Store
No preview for this file type
src/main/webapp/css/pay.css
@@ -260,95 +260,105 @@ td&gt;div { @@ -260,95 +260,105 @@ td&gt;div {
260 border-radius: 5px; 260 border-radius: 5px;
261 } 261 }
262 262
263 -/*footer.css*/  
264 -.footer {  
265 - width: 100%;  
266 - height: auto;  
267 - background-color: #3c3c3c  
268 -}  
269 -  
270 -.footer a:hover {  
271 - color: #1287cd  
272 -}  
273 -  
274 -.canrd-site-map {  
275 - position: relative;  
276 - width: 1000px;  
277 - height: 320px;  
278 - margin: 0 auto;  
279 - padding-top: 50px; 263 +/**新增地址*/
  264 +.recipBox {
  265 + width: 638px;
  266 + height: 560px;
  267 + border: 4px solid #CCCCCC;
  268 + background: #fff;
  269 + left: 50%;
  270 + top: 50%;
  271 + margin: -280px 0 0 -319px;
  272 + position: absolute;
  273 + position: fixed !important;
  274 + z-index: 55;
  275 + display: none;
  276 +}
  277 +
  278 +.recipBox .recipComm {
  279 + margin-top: 0px;
  280 + font-size: 12px;
280 } 281 }
281 282
282 -dl, dd {  
283 - margin: 0 283 +.recipBox .recipComm ul li {
  284 + font-size: 16px;
  285 + color: #656565;
  286 + line-height: 32px;
  287 + margin-top: 30px;
284 } 288 }
285 289
286 -.canrd-site-map dl {  
287 - width: 200px;  
288 - color: #ffffff; 290 +.fl {
289 float: left; 291 float: left;
290 - clear: right;  
291 } 292 }
292 293
293 -.canrd-site-map dt {  
294 - font-size: 18px; 294 +.liststyle{}
295 295
  296 +.liststyle .loc_province {
  297 + margin-left: 6px;
296 } 298 }
297 299
298 -.canrd-site-map dd {  
299 - margin: 25px auto;  
300 - font-size: 14px;  
301 - color: #C3C5C6;  
302 -}  
303 300
304 -.canrd-site-map dd a {  
305 - color: #C3C5C6;  
306 -}  
307 301
308 -.canrd-site-map .follow-us {  
309 - width: 330px;  
310 - margin-left: 50px; 302 +.liststyle .loc_city {
  303 + margin-left: 28px;
  304 + margin-right: 28px;
311 } 305 }
312 306
313 -.contact-detail{  
314 - margin-left: 2em; 307 +.liststyle .loc_province, .liststyle .loc_city, .liststyle .loc_town {
  308 + width: 124px;
  309 + height: 32px;
  310 + border: 1px solid #CDCDCD;
  311 + color: #666666;
  312 + font-size: 14px;
  313 + line-height: 14px;
  314 + padding: 5px 0px 5px 4px;
315 } 315 }
316 316
317 -.follow-us div {  
318 - overflow: hidden; 317 +.recipBox .recipComm .reg_span {
  318 + width: 140px;
  319 + display: inline-block;
  320 + text-align: right;
  321 + line-height: 32px;
319 } 322 }
320 323
321 -.follow-us div dd {  
322 - margin-bottom: 0; 324 +.recipBox .recipComm .recipt_add {
  325 + width: 422px;
  326 + color: #656565;
323 } 327 }
324 328
325 -.follow-us .time {  
326 - font-size: 12px; 329 +.recipBox .recipComm .recip_inpt {
  330 + width: 268px;
  331 + color: #656565;
327 } 332 }
328 333
329 -.canrd-site-map .site-addr {  
330 - margin-top:18px; 334 +.recipBox .recipComm .recip_inpt {
  335 + width: 268px;
  336 + color: #656565;
331 } 337 }
332 338
333 -.canrd-site-map .barcode {  
334 - float: left;  
335 - margin-right: 20px; 339 +.recip_But {
  340 + margin-left: 60px;
336 } 341 }
337 342
338 -.friendly-link {  
339 - width: 100%;  
340 - height: 70px;  
341 - line-height: 70px; 343 +.recip_But .recip_su {
  344 + background: url(/img/sjxx_qr.png) no-repeat;
  345 + width: 130px;
  346 + height: 34px;
  347 + color: #FFFFFF;
  348 + font-size: 16px;
  349 + display: inline-block;
342 text-align: center; 350 text-align: center;
343 - background-color: #313131;  
344 - font-size: 14px;  
345 -}  
346 -  
347 -.friendly-link span {  
348 - color: #646464; 351 + line-height: 34px;
349 } 352 }
350 353
351 -.friendly-link a {  
352 - color: #c3c5c6;  
353 - margin-left: 20px; 354 +.recip_But .recip_qx {
  355 + background: url(/img/sjxx_qx.png) no-repeat;
  356 + margin-left: 30px;
  357 + width: 70px;
  358 + height: 34px;
  359 + color: #666666;
  360 + font-size: 16px;
  361 + display: inline-block;
  362 + text-align: center;
  363 + line-height: 34px;
354 } 364 }
355 \ No newline at end of file 365 \ No newline at end of file
src/main/webapp/customer_contact.jsp 0 → 100644
  1 +<%--
  2 + Created by IntelliJ IDEA.
  3 + User: litao
  4 + Date: 16-8-15
  5 + Time: 下午2:49
  6 + To change this template use File | Settings | File Templates.
  7 +--%>
  8 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  9 +<html>
  10 +<head>
  11 + <title>新增收件人信息</title>
  12 + <style>
  13 + label.required:before {
  14 + content:"*";
  15 + color:#EF5F5F;
  16 + }
  17 + label {
  18 + display:inline-block;
  19 + width:100px;
  20 + text-align:right;
  21 + padding-right:4px;
  22 + border-color:green;
  23 + border-style:solid;
  24 + }
  25 + input {
  26 + margin:2px;
  27 + vertical-align:middle;
  28 + border-color:green;
  29 + border-style:solid;
  30 + }
  31 + .recipBox {
  32 + width: 638px;
  33 + height: 560px;
  34 + border: 4px solid #CCCCCC;
  35 + background: #fff;
  36 + left: 50%;
  37 + top: 50%;
  38 + margin: -280px 0 0 -319px;
  39 + position: absolute;
  40 + position: fixed !important;
  41 + z-index: 55;
  42 + display: none;
  43 + }
  44 + </style>
  45 + <script type="text/javascript">
  46 + alert(document.getElementById("r").clientWidth);
  47 + </script>
  48 +</head>
  49 +<body>
  50 + <%--<form>
  51 + <div>
  52 + <label id="r" class="required">收件人:</label>
  53 + <input type="text" name="receiver" required="required"
  54 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  55 + </div>
  56 + <div>
  57 + <label class="required">收件地址:</label>
  58 + <input type="text" name="addressHead" required="required"
  59 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  60 + </div>
  61 + <div>
  62 + <label class="required">详细地址:</label>
  63 + <input type="text" name="addressDetail" required="required"
  64 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  65 + </div>
  66 + <div>
  67 + <label class="required">邮编:</label>
  68 + <input type="text" name="postcode" required="required"
  69 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  70 + </div>
  71 + <div>
  72 + <label class="required">手机:</label>
  73 + <input type="text" name="cellphone" required="required"
  74 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  75 + </div>
  76 + <div>
  77 + <label>座机号:</label>
  78 + <input type="text" name="telephone"/>
  79 + </div>
  80 + <div><input type="submit" value="确认" />&nbsp;&nbsp;&nbsp;&nbsp;
  81 + <input type="submit" value="取消"/>
  82 + </div>
  83 + </form>--%>
  84 +</body>
  85 +</html>
src/main/webapp/img/sjxx_qr.png 0 → 100644

1.15 KB

src/main/webapp/img/sjxx_qx.png 0 → 100644

1.12 KB

src/main/webapp/pay.jsp
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 52
53 <form class="info-form"> 53 <form class="info-form">
54 <div> 54 <div>
55 - <%--<input type="checkbox" value="广东省广州市萝岗区伴河路92号 (李强收)"> 55 + <input type="checkbox" value="广东省广州市萝岗区伴河路92号 (李强收)">
56 <label for="">广东省广州市萝岗区伴河路92号 (<span class="user-name">李强</span> 收) </label> 56 <label for="">广东省广州市萝岗区伴河路92号 (<span class="user-name">李强</span> 收) </label>
57 <span class="comment">默认地址</span> 57 <span class="comment">默认地址</span>
58 58
@@ -60,14 +60,14 @@ @@ -60,14 +60,14 @@
60 <span>编辑</span> 60 <span>编辑</span>
61 <span>删除</span> 61 <span>删除</span>
62 <span>设为默认地址</span> 62 <span>设为默认地址</span>
63 - </div>--%> 63 + </div>
64 <form class=""> 64 <form class="">
65 <label for="">地址&nbsp;&nbsp;</label><input id="address" type="text" value=""/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 65 <label for="">地址&nbsp;&nbsp;</label><input id="address" type="text" value=""/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
66 <label for="">电话&nbsp;&nbsp;</label><input id="phone" type="text" value="" style="width: 200px"/> 66 <label for="">电话&nbsp;&nbsp;</label><input id="phone" type="text" value="" style="width: 200px"/>
67 </form> 67 </form>
68 </div> 68 </div>
69 </form> 69 </form>
70 - <%--<div class="add-info add-addr">新增其他地址</div>--%> 70 + <div class="add-info add-addr">新增其他地址</div>
71 </div> 71 </div>
72 <div class="invoice-info"> 72 <div class="invoice-info">
73 <h2>发票信息</h2> 73 <h2>发票信息</h2>
@@ -127,6 +127,47 @@ @@ -127,6 +127,47 @@
127 </div> 127 </div>
128 </div> 128 </div>
129 <jsp:include page="/include/footer.jsp" flush="true"/> 129 <jsp:include page="/include/footer.jsp" flush="true"/>
  130 +
  131 +<div class="recipBox" id="dialog" style="display: block;">
  132 + <input type="hidden" field="id" value="" formid="form1" isfield="1">
  133 + <div class="recip_tit">
  134 + <span>新增收件信息</span>
  135 + <a href="javascript:void(0)" onclick="closeBg();"><img src="/static/com/img/icon/cha.png?v=9bb493e47616de7a6ecc252c5034bf79"></a>
  136 + </div>
  137 + <div class="recipComm">
  138 + <ul>
  139 + <li>
  140 + <span class="reg_span"><i>*</i>收件人:</span>
  141 + <input type="text" class="recip_inpt" placeholder="请输入您的姓名全称" autocomplete="off" field="takename" title="收件人" r="1" formid="form1" isfield="1"></li>
  142 + <li class="li_wid">
  143 + <span class="reg_span fl"><i>*</i>收件地址:</span>
  144 + <div class="liststyle fl">
  145 + <select id="loc_province" class="loc_province" field="provinceid" title="省份" r="1" formid="form1" isfield="1"><option value="">省份</option><option value="1">北京市</option><option value="22">天津市</option><option value="44">上海市</option><option value="66">重庆市</option><option value="108">河北省</option><option value="406">山西省</option><option value="622">内蒙古</option><option value="804">辽宁省</option><option value="945">吉林省</option><option value="1036">黑龙江省</option><option value="1226">江苏省</option><option value="1371">浙江省</option><option value="1500">安徽省</option><option value="1679">福建省</option><option value="1812">江西省</option><option value="1992">山东省</option><option value="2197">河南省</option><option value="2456">湖北省</option><option value="2613">湖南省</option><option value="2822">广东省</option><option value="3015">广西</option><option value="3201">海南省</option><option value="3235">四川省</option><option value="3561">贵州省</option><option value="3728">云南省</option><option value="3983">西藏</option><option value="4136">陕西省</option><option value="4334">甘肃省</option><option value="4499">青海省</option><option value="4588">宁夏</option><option value="4624">新疆</option><option value="4802">香港</option><option value="4822">澳门</option><option value="4825">台湾省</option></select>
  146 + <select id="loc_city" class="loc_city" field="cityid" title="市" r="1" formid="form1" isfield="1"><option value="">地级市</option></select>
  147 + <select id="loc_town" class="loc_town" field="areaid" title="区县" r="0" formid="form1" isfield="1"><option value="">市、县、区</option></select>
  148 + <input type="hidden" name="location_id" value="">
  149 + </div>
  150 + </li>
  151 + <li>
  152 + <span class="reg_span"><i>*</i>详细地址:</span>
  153 + <input type="text" class="recipt_add" placeholder="地址限制在50个字以内" autocomplete="off" field="address" title="详细地址" r="1" formid="form1" isfield="1"></li>
  154 + <li>
  155 + <span class="reg_span"><i>*</i>邮编:</span>
  156 + <input type="text" class="recip_inpt" autocomplete="off" field="zip" title="邮编" r="1" id="txt_zip" formid="form1" isfield="1"></li>
  157 + <li>
  158 + <span class="reg_span"><i>*</i>手机:</span>
  159 + <input type="text" class="recip_inpt" autocomplete="off" field="mobile" id="txt_mobile" title="手机" r="1" formid="form1" isfield="1"></li>
  160 + <li>
  161 + <span class="reg_span">坐机号:</span>
  162 + <input type="text" class="recip_inpt" autocomplete="off" field="phone" title="座机号" formid="form1" isfield="1"></li>
  163 +
  164 + <li class="recip_But">
  165 + <a href="javascript:saveaddress()" class="recip_su">确认地址信息</a>
  166 + <a href="javascript:closeBg()" class="recip_qx">取消</a>
  167 + </li>
  168 + </ul>
  169 + </div>
  170 +</div>
130 </body> 171 </body>
131 </html> 172 </html>
132 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script> 173 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
@@ -191,40 +232,4 @@ @@ -191,40 +232,4 @@
191 $("#pay_form").attr("action","/save_order"); 232 $("#pay_form").attr("action","/save_order");
192 $("#pay_form").submit(); 233 $("#pay_form").submit();
193 } 234 }
194 - /*var case_list_body=$(".case_list_body");  
195 - $.ajax({  
196 - url:"/find_latest_case",  
197 - type:"POST",  
198 - dataType:"JSON",  
199 - async:false,  
200 - success: function (res) {  
201 - var casement = res.data;  
202 - if (casement) {  
203 - var trMain = $("<tr></tr>").appendTo(case_list_body);  
204 - //类型  
205 - var tdType = $("<td></td>").appendTo(trMain);  
206 - var spanType = $("<span></span>").text(casement['caseType']).appendTo(tdType);  
207 -  
208 - //名称  
209 - var tdName = $("<td></td>").appendTo(trMain);  
210 - var spanName = $("<span></span>").text(casement['name'] == null ? "暂无" : casement['name']).appendTo(tdName);  
211 -  
212 - //编号  
213 - var tdSn = $("<td></td>").appendTo(trMain);  
214 - var spanSn = $("<span></span>").text(casement['caseSn']).appendTo(tdSn);  
215 -  
216 - //费用  
217 - var tdExpense = $("<td></td>").appendTo(trMain);  
218 - var spanExpense = $("<span></span>").text(casement['expense']).appendTo(tdExpense);  
219 - //footer信息  
220 - var trFooter = $("<tr class='case-list-item-bottom-tr'></tr>").appendTo(case_list_body);  
221 - var tdFooter = $("<td colspan='4'></td>").appendTo(trFooter);  
222 - $("<span>合同号:<span>" + casement['caseSn'] + "</span></span>").appendTo(tdFooter);  
223 - $("<span>立案时间:<span>" + casement['createDate'] + "</span></span>").appendTo(tdFooter);  
224 - }  
225 - },  
226 - error:function(err){  
227 - alert(err);  
228 - }  
229 - });*/  
230 </script> 235 </script>
target/patent/css/pay.css
@@ -260,95 +260,105 @@ td&gt;div { @@ -260,95 +260,105 @@ td&gt;div {
260 border-radius: 5px; 260 border-radius: 5px;
261 } 261 }
262 262
263 -/*footer.css*/  
264 -.footer {  
265 - width: 100%;  
266 - height: auto;  
267 - background-color: #3c3c3c  
268 -}  
269 -  
270 -.footer a:hover {  
271 - color: #1287cd  
272 -}  
273 -  
274 -.canrd-site-map {  
275 - position: relative;  
276 - width: 1000px;  
277 - height: 320px;  
278 - margin: 0 auto;  
279 - padding-top: 50px; 263 +/**新增地址*/
  264 +.recipBox {
  265 + width: 638px;
  266 + height: 560px;
  267 + border: 4px solid #CCCCCC;
  268 + background: #fff;
  269 + left: 50%;
  270 + top: 50%;
  271 + margin: -280px 0 0 -319px;
  272 + position: absolute;
  273 + position: fixed !important;
  274 + z-index: 55;
  275 + display: none;
  276 +}
  277 +
  278 +.recipBox .recipComm {
  279 + margin-top: 0px;
  280 + font-size: 12px;
280 } 281 }
281 282
282 -dl, dd {  
283 - margin: 0 283 +.recipBox .recipComm ul li {
  284 + font-size: 16px;
  285 + color: #656565;
  286 + line-height: 32px;
  287 + margin-top: 30px;
284 } 288 }
285 289
286 -.canrd-site-map dl {  
287 - width: 200px;  
288 - color: #ffffff; 290 +.fl {
289 float: left; 291 float: left;
290 - clear: right;  
291 } 292 }
292 293
293 -.canrd-site-map dt {  
294 - font-size: 18px; 294 +.liststyle{}
295 295
  296 +.liststyle .loc_province {
  297 + margin-left: 6px;
296 } 298 }
297 299
298 -.canrd-site-map dd {  
299 - margin: 25px auto;  
300 - font-size: 14px;  
301 - color: #C3C5C6;  
302 -}  
303 300
304 -.canrd-site-map dd a {  
305 - color: #C3C5C6;  
306 -}  
307 301
308 -.canrd-site-map .follow-us {  
309 - width: 330px;  
310 - margin-left: 50px; 302 +.liststyle .loc_city {
  303 + margin-left: 28px;
  304 + margin-right: 28px;
311 } 305 }
312 306
313 -.contact-detail{  
314 - margin-left: 2em; 307 +.liststyle .loc_province, .liststyle .loc_city, .liststyle .loc_town {
  308 + width: 124px;
  309 + height: 32px;
  310 + border: 1px solid #CDCDCD;
  311 + color: #666666;
  312 + font-size: 14px;
  313 + line-height: 14px;
  314 + padding: 5px 0px 5px 4px;
315 } 315 }
316 316
317 -.follow-us div {  
318 - overflow: hidden; 317 +.recipBox .recipComm .reg_span {
  318 + width: 140px;
  319 + display: inline-block;
  320 + text-align: right;
  321 + line-height: 32px;
319 } 322 }
320 323
321 -.follow-us div dd {  
322 - margin-bottom: 0; 324 +.recipBox .recipComm .recipt_add {
  325 + width: 422px;
  326 + color: #656565;
323 } 327 }
324 328
325 -.follow-us .time {  
326 - font-size: 12px; 329 +.recipBox .recipComm .recip_inpt {
  330 + width: 268px;
  331 + color: #656565;
327 } 332 }
328 333
329 -.canrd-site-map .site-addr {  
330 - margin-top:18px; 334 +.recipBox .recipComm .recip_inpt {
  335 + width: 268px;
  336 + color: #656565;
331 } 337 }
332 338
333 -.canrd-site-map .barcode {  
334 - float: left;  
335 - margin-right: 20px; 339 +.recip_But {
  340 + margin-left: 60px;
336 } 341 }
337 342
338 -.friendly-link {  
339 - width: 100%;  
340 - height: 70px;  
341 - line-height: 70px; 343 +.recip_But .recip_su {
  344 + background: url(/img/sjxx_qr.png) no-repeat;
  345 + width: 130px;
  346 + height: 34px;
  347 + color: #FFFFFF;
  348 + font-size: 16px;
  349 + display: inline-block;
342 text-align: center; 350 text-align: center;
343 - background-color: #313131;  
344 - font-size: 14px;  
345 -}  
346 -  
347 -.friendly-link span {  
348 - color: #646464; 351 + line-height: 34px;
349 } 352 }
350 353
351 -.friendly-link a {  
352 - color: #c3c5c6;  
353 - margin-left: 20px; 354 +.recip_But .recip_qx {
  355 + background: url(/img/sjxx_qx.png) no-repeat;
  356 + margin-left: 30px;
  357 + width: 70px;
  358 + height: 34px;
  359 + color: #666666;
  360 + font-size: 16px;
  361 + display: inline-block;
  362 + text-align: center;
  363 + line-height: 34px;
354 } 364 }
355 \ No newline at end of file 365 \ No newline at end of file
target/patent/pay.jsp
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 52
53 <form class="info-form"> 53 <form class="info-form">
54 <div> 54 <div>
55 - <%--<input type="checkbox" value="广东省广州市萝岗区伴河路92号 (李强收)"> 55 + <input type="checkbox" value="广东省广州市萝岗区伴河路92号 (李强收)">
56 <label for="">广东省广州市萝岗区伴河路92号 (<span class="user-name">李强</span> 收) </label> 56 <label for="">广东省广州市萝岗区伴河路92号 (<span class="user-name">李强</span> 收) </label>
57 <span class="comment">默认地址</span> 57 <span class="comment">默认地址</span>
58 58
@@ -60,14 +60,14 @@ @@ -60,14 +60,14 @@
60 <span>编辑</span> 60 <span>编辑</span>
61 <span>删除</span> 61 <span>删除</span>
62 <span>设为默认地址</span> 62 <span>设为默认地址</span>
63 - </div>--%> 63 + </div>
64 <form class=""> 64 <form class="">
65 <label for="">地址&nbsp;&nbsp;</label><input id="address" type="text" value=""/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 65 <label for="">地址&nbsp;&nbsp;</label><input id="address" type="text" value=""/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
66 <label for="">电话&nbsp;&nbsp;</label><input id="phone" type="text" value="" style="width: 200px"/> 66 <label for="">电话&nbsp;&nbsp;</label><input id="phone" type="text" value="" style="width: 200px"/>
67 </form> 67 </form>
68 </div> 68 </div>
69 </form> 69 </form>
70 - <%--<div class="add-info add-addr">新增其他地址</div>--%> 70 + <div class="add-info add-addr">新增其他地址</div>
71 </div> 71 </div>
72 <div class="invoice-info"> 72 <div class="invoice-info">
73 <h2>发票信息</h2> 73 <h2>发票信息</h2>
@@ -127,6 +127,47 @@ @@ -127,6 +127,47 @@
127 </div> 127 </div>
128 </div> 128 </div>
129 <jsp:include page="/include/footer.jsp" flush="true"/> 129 <jsp:include page="/include/footer.jsp" flush="true"/>
  130 +
  131 +<div class="recipBox" id="dialog" style="display: block;">
  132 + <input type="hidden" field="id" value="" formid="form1" isfield="1">
  133 + <div class="recip_tit">
  134 + <span>新增收件信息</span>
  135 + <a href="javascript:void(0)" onclick="closeBg();"><img src="/static/com/img/icon/cha.png?v=9bb493e47616de7a6ecc252c5034bf79"></a>
  136 + </div>
  137 + <div class="recipComm">
  138 + <ul>
  139 + <li>
  140 + <span class="reg_span"><i>*</i>收件人:</span>
  141 + <input type="text" class="recip_inpt" placeholder="请输入您的姓名全称" autocomplete="off" field="takename" title="收件人" r="1" formid="form1" isfield="1"></li>
  142 + <li class="li_wid">
  143 + <span class="reg_span fl"><i>*</i>收件地址:</span>
  144 + <div class="liststyle fl">
  145 + <select id="loc_province" class="loc_province" field="provinceid" title="省份" r="1" formid="form1" isfield="1"><option value="">省份</option><option value="1">北京市</option><option value="22">天津市</option><option value="44">上海市</option><option value="66">重庆市</option><option value="108">河北省</option><option value="406">山西省</option><option value="622">内蒙古</option><option value="804">辽宁省</option><option value="945">吉林省</option><option value="1036">黑龙江省</option><option value="1226">江苏省</option><option value="1371">浙江省</option><option value="1500">安徽省</option><option value="1679">福建省</option><option value="1812">江西省</option><option value="1992">山东省</option><option value="2197">河南省</option><option value="2456">湖北省</option><option value="2613">湖南省</option><option value="2822">广东省</option><option value="3015">广西</option><option value="3201">海南省</option><option value="3235">四川省</option><option value="3561">贵州省</option><option value="3728">云南省</option><option value="3983">西藏</option><option value="4136">陕西省</option><option value="4334">甘肃省</option><option value="4499">青海省</option><option value="4588">宁夏</option><option value="4624">新疆</option><option value="4802">香港</option><option value="4822">澳门</option><option value="4825">台湾省</option></select>
  146 + <select id="loc_city" class="loc_city" field="cityid" title="市" r="1" formid="form1" isfield="1"><option value="">地级市</option></select>
  147 + <select id="loc_town" class="loc_town" field="areaid" title="区县" r="0" formid="form1" isfield="1"><option value="">市、县、区</option></select>
  148 + <input type="hidden" name="location_id" value="">
  149 + </div>
  150 + </li>
  151 + <li>
  152 + <span class="reg_span"><i>*</i>详细地址:</span>
  153 + <input type="text" class="recipt_add" placeholder="地址限制在50个字以内" autocomplete="off" field="address" title="详细地址" r="1" formid="form1" isfield="1"></li>
  154 + <li>
  155 + <span class="reg_span"><i>*</i>邮编:</span>
  156 + <input type="text" class="recip_inpt" autocomplete="off" field="zip" title="邮编" r="1" id="txt_zip" formid="form1" isfield="1"></li>
  157 + <li>
  158 + <span class="reg_span"><i>*</i>手机:</span>
  159 + <input type="text" class="recip_inpt" autocomplete="off" field="mobile" id="txt_mobile" title="手机" r="1" formid="form1" isfield="1"></li>
  160 + <li>
  161 + <span class="reg_span">坐机号:</span>
  162 + <input type="text" class="recip_inpt" autocomplete="off" field="phone" title="座机号" formid="form1" isfield="1"></li>
  163 +
  164 + <li class="recip_But">
  165 + <a href="javascript:saveaddress()" class="recip_su">确认地址信息</a>
  166 + <a href="javascript:closeBg()" class="recip_qx">取消</a>
  167 + </li>
  168 + </ul>
  169 + </div>
  170 +</div>
130 </body> 171 </body>
131 </html> 172 </html>
132 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script> 173 <script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
@@ -191,40 +232,4 @@ @@ -191,40 +232,4 @@
191 $("#pay_form").attr("action","/save_order"); 232 $("#pay_form").attr("action","/save_order");
192 $("#pay_form").submit(); 233 $("#pay_form").submit();
193 } 234 }
194 - /*var case_list_body=$(".case_list_body");  
195 - $.ajax({  
196 - url:"/find_latest_case",  
197 - type:"POST",  
198 - dataType:"JSON",  
199 - async:false,  
200 - success: function (res) {  
201 - var casement = res.data;  
202 - if (casement) {  
203 - var trMain = $("<tr></tr>").appendTo(case_list_body);  
204 - //类型  
205 - var tdType = $("<td></td>").appendTo(trMain);  
206 - var spanType = $("<span></span>").text(casement['caseType']).appendTo(tdType);  
207 -  
208 - //名称  
209 - var tdName = $("<td></td>").appendTo(trMain);  
210 - var spanName = $("<span></span>").text(casement['name'] == null ? "暂无" : casement['name']).appendTo(tdName);  
211 -  
212 - //编号  
213 - var tdSn = $("<td></td>").appendTo(trMain);  
214 - var spanSn = $("<span></span>").text(casement['caseSn']).appendTo(tdSn);  
215 -  
216 - //费用  
217 - var tdExpense = $("<td></td>").appendTo(trMain);  
218 - var spanExpense = $("<span></span>").text(casement['expense']).appendTo(tdExpense);  
219 - //footer信息  
220 - var trFooter = $("<tr class='case-list-item-bottom-tr'></tr>").appendTo(case_list_body);  
221 - var tdFooter = $("<td colspan='4'></td>").appendTo(trFooter);  
222 - $("<span>合同号:<span>" + casement['caseSn'] + "</span></span>").appendTo(tdFooter);  
223 - $("<span>立案时间:<span>" + casement['createDate'] + "</span></span>").appendTo(tdFooter);  
224 - }  
225 - },  
226 - error:function(err){  
227 - alert(err);  
228 - }  
229 - });*/  
230 </script> 235 </script>