kelude / canrd-patent · Commits

Commit 4aee6f034a848184a162f7627aa9ba8ec057e129

Authored by maoyangou
1 parent 6a13fa75
build: skipped

专利前端整理

Inline Side-by-side
Showing 20 changed files with 502 additions and 1548 deletions
.idea/workspace.xml
  View file @4aee6f0
@@ -2,53 +2,26 @@ @@ -2,53 +2,26 @@
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/CaseOutputDto.class" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Casement.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Casement.class" />  
11 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Casement.class" />  
12 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" />  
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criteria.class" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" />  
15 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$Criterion.class" />  
16 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" />  
17 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/CasementExample$GeneratedCriteria.class" />  
18 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" />  
19 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" />  
20 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Order.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Order.class" />  
21 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class" />  
22 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" />  
23 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class" />  
24 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" />  
25 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class" />  
26 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" />  
27 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class" /> 5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/css/order_detail.css" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/include/user_side.jsp" />
  7 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/css/user-side-bar.css" afterPath="" />
  8 + <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/css/user-side-bar.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css" />
  9 + <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/patent-index.css" />
28 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" /> 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/OrderPageController.class" />
29 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class" />
30 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/OrderService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/OrderService.class" />  
31 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class" />  
32 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />  
33 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />  
34 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />  
35 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />  
36 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml" />  
37 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/CasementMapper.xml" />  
38 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/CasementMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/CasementMapper.xml" />  
39 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />  
40 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java" />  
41 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/OrderExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/OrderExample.java" />  
42 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />  
43 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml" />  
44 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/OrderMapper.xml" />  
45 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/OrderMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/OrderMapper.xml" /> 12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" />
46 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" /> 13 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
47 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" /> 14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/case-detail.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/case-detail.css" />
  15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/css/case-detail.css" afterPath="$PROJECT_DIR$/target/patent/css/case-detail.css" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" />
  17 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/case_detail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_detail.jsp" />
48 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" /> 18 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
49 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />  
50 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay.jsp" afterPath="$PROJECT_DIR$/target/patent/pay.jsp" /> 19 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" />
  20 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/index.jsp" afterPath="$PROJECT_DIR$/target/patent/index.jsp" />
  21 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
  22 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/order_detail.jsp" afterPath="$PROJECT_DIR$/target/patent/order_detail.jsp" />
51 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 23 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  24 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/css/zhuanli-index.css" afterPath="$PROJECT_DIR$/target/patent/css/zhuanli-index.css" />
52 </list> 25 </list>
53 <ignored path="patent.iws" /> 26 <ignored path="patent.iws" />
54 <ignored path=".idea/workspace.xml" /> 27 <ignored path=".idea/workspace.xml" />
@@ -71,91 +44,101 @@ @@ -71,91 +44,101 @@
71 </component> 44 </component>
72 <component name="FileEditorManager"> 45 <component name="FileEditorManager">
73 <leaf> 46 <leaf>
74 - <file leaf-file-name="OrderPageController.java" pinned="false" current-in-tab="false">  
75 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java"> 47 + <file leaf-file-name="case_manage.jsp" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
76 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
77 - <state vertical-scroll-proportion="0.0">  
78 - <caret line="94" column="47" selection-start-line="94" selection-start-column="35" selection-end-line="94" selection-end-column="47" /> 50 + <state vertical-scroll-proportion="-3.75">
  51 + <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />
79 <folding /> 52 <folding />
80 </state> 53 </state>
81 </provider> 54 </provider>
82 </entry> 55 </entry>
83 </file> 56 </file>
84 - <file leaf-file-name="OrderListOutputDto.java" pinned="false" current-in-tab="false">  
85 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java"> 57 + <file leaf-file-name="case-manage.css" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css">
86 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
87 <state vertical-scroll-proportion="0.0"> 60 <state vertical-scroll-proportion="0.0">
88 - <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />  
89 - <folding>  
90 - <element signature="e#415#416#0" expanded="true" />  
91 - <element signature="e#465#466#0" expanded="true" />  
92 - </folding> 61 + <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
  62 + <folding />
93 </state> 63 </state>
94 </provider> 64 </provider>
95 </entry> 65 </entry>
96 </file> 66 </file>
97 - <file leaf-file-name="CaseOutputDto.java" pinned="false" current-in-tab="false">  
98 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java"> 67 + <file leaf-file-name="index.jsp" pinned="false" current-in-tab="false">
  68 + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
99 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
100 - <state vertical-scroll-proportion="0.0">  
101 - <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />  
102 - <folding>  
103 - <element signature="imports" expanded="true" />  
104 - </folding> 70 + <state vertical-scroll-proportion="-3.75">
  71 + <caret line="6" column="64" selection-start-line="6" selection-start-column="64" selection-end-line="6" selection-end-column="64" />
  72 + <folding />
105 </state> 73 </state>
106 </provider> 74 </provider>
107 </entry> 75 </entry>
108 </file> 76 </file>
109 - <file leaf-file-name="order_detail.jsp" pinned="false" current-in-tab="true">  
110 - <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp"> 77 + <file leaf-file-name="patent-index.css" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/patent-index.css">
111 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
112 - <state vertical-scroll-proportion="1.2269231">  
113 - <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" /> 80 + <state vertical-scroll-proportion="-7.703704">
  81 + <caret line="116" column="2" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="2" />
114 <folding /> 82 <folding />
115 </state> 83 </state>
116 </provider> 84 </provider>
117 </entry> 85 </entry>
118 </file> 86 </file>
119 - <file leaf-file-name="OrderOutputDto.java" pinned="false" current-in-tab="false">  
120 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java"> 87 + <file leaf-file-name="home.css" pinned="false" current-in-tab="true">
  88 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
121 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
122 - <state vertical-scroll-proportion="0.0">  
123 - <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />  
124 - <folding>  
125 - <element signature="e#257#258#0" expanded="true" />  
126 - <element signature="e#293#294#0" expanded="true" />  
127 - <element signature="e#358#359#0" expanded="true" />  
128 - <element signature="e#408#409#0" expanded="true" />  
129 - </folding> 90 + <state vertical-scroll-proportion="-0.65189874">
  91 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  92 + <folding />
130 </state> 93 </state>
131 </provider> 94 </provider>
132 </entry> 95 </entry>
133 </file> 96 </file>
134 - <file leaf-file-name="case_manage.jsp" pinned="false" current-in-tab="false">  
135 - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp"> 97 + <file leaf-file-name="pay_result.jsp" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
136 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
137 - <state vertical-scroll-proportion="-31.041666">  
138 - <caret line="131" column="42" selection-start-line="131" selection-start-column="42" selection-end-line="131" selection-end-column="42" /> 100 + <state vertical-scroll-proportion="-18.125">
  101 + <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="64" />
139 <folding /> 102 <folding />
140 </state> 103 </state>
141 </provider> 104 </provider>
142 </entry> 105 </entry>
143 </file> 106 </file>
144 - <file leaf-file-name="case_detail.jsp" pinned="false" current-in-tab="false">  
145 - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp"> 107 + <file leaf-file-name="service.jsp" pinned="false" current-in-tab="false">
  108 + <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp">
146 <provider selected="true" editor-type-id="text-editor"> 109 <provider selected="true" editor-type-id="text-editor">
147 - <state vertical-scroll-proportion="80.0"> 110 + <state vertical-scroll-proportion="26.25">
148 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 111 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
149 <folding /> 112 <folding />
150 </state> 113 </state>
151 </provider> 114 </provider>
152 </entry> 115 </entry>
153 </file> 116 </file>
154 - <file leaf-file-name="ReduceTypeEnum.java" pinned="false" current-in-tab="false">  
155 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java"> 117 + <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="false">
  118 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
156 <provider selected="true" editor-type-id="text-editor"> 119 <provider selected="true" editor-type-id="text-editor">
157 - <state vertical-scroll-proportion="0.0">  
158 - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> 120 + <state vertical-scroll-proportion="-20.625">
  121 + <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
  122 + <folding />
  123 + </state>
  124 + </provider>
  125 + </entry>
  126 + </file>
  127 + <file leaf-file-name="order_detail.jsp" pinned="false" current-in-tab="false">
  128 + <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
  129 + <provider selected="true" editor-type-id="text-editor">
  130 + <state vertical-scroll-proportion="-12.5">
  131 + <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="69" />
  132 + <folding />
  133 + </state>
  134 + </provider>
  135 + </entry>
  136 + </file>
  137 + <file leaf-file-name="case_detail.jsp" pinned="false" current-in-tab="false">
  138 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
  139 + <provider selected="true" editor-type-id="text-editor">
  140 + <state vertical-scroll-proportion="58.75">
  141 + <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
159 <folding /> 142 <folding />
160 </state> 143 </state>
161 </provider> 144 </provider>
@@ -166,11 +149,11 @@ @@ -166,11 +149,11 @@
166 <component name="FileTemplateManagerImpl"> 149 <component name="FileTemplateManagerImpl">
167 <option name="RECENT_TEMPLATES"> 150 <option name="RECENT_TEMPLATES">
168 <list> 151 <list>
169 - <option value="CSS File" />  
170 <option value="jsf" /> 152 <option value="jsf" />
171 <option value="Jsp File" /> 153 <option value="Jsp File" />
172 <option value="Enum" /> 154 <option value="Enum" />
173 <option value="Class" /> 155 <option value="Class" />
  156 + <option value="CSS File" />
174 </list> 157 </list>
175 </option> 158 </option>
176 </component> 159 </component>
@@ -185,13 +168,6 @@ @@ -185,13 +168,6 @@
185 <component name="IdeDocumentHistory"> 168 <component name="IdeDocumentHistory">
186 <option name="CHANGED_PATHS"> 169 <option name="CHANGED_PATHS">
187 <list> 170 <list>
188 - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceTypeEnum.java" />  
189 - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeDto.java" />  
190 - <option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />  
191 - <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />  
192 - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/Enum.java" />  
193 - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java" />  
194 - <option value="$PROJECT_DIR$/doc/sql/ddl.sql" />  
195 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java" /> 171 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java" />
196 <option value="$PROJECT_DIR$/src/main/webapp/include/header.jsp" /> 172 <option value="$PROJECT_DIR$/src/main/webapp/include/header.jsp" />
197 <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> 173 <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" />
@@ -223,9 +199,7 @@ @@ -223,9 +199,7 @@
223 <option value="$PROJECT_DIR$/src/main/resources.local/logback.xml" /> 199 <option value="$PROJECT_DIR$/src/main/resources.local/logback.xml" />
224 <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" /> 200 <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
225 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" /> 201 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" />
226 - <option value="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />  
227 <option value="$PROJECT_DIR$/src/main/webapp/notice.jsp" /> 202 <option value="$PROJECT_DIR$/src/main/webapp/notice.jsp" />
228 - <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />  
229 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" /> 203 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java" />
230 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" /> 204 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
231 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" /> 205 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
@@ -233,9 +207,18 @@ @@ -233,9 +207,18 @@
233 <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" /> 207 <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
234 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" /> 208 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
235 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" /> 209 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java" />
236 - <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" /> 210 + <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
  211 + <option value="$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css" />
237 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" /> 212 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java" />
238 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" /> 213 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
  214 + <option value="$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css" />
  215 + <option value="$PROJECT_DIR$/src/main/webapp/include/user_side.jsp" />
  216 + <option value="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
  217 + <option value="$PROJECT_DIR$/src/main/webapp/css/case-detail.css" />
  218 + <option value="$PROJECT_DIR$/src/main/webapp/css/order_detail.css" />
  219 + <option value="$PROJECT_DIR$/src/main/webapp/case_detail.jsp" />
  220 + <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
  221 + <option value="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" />
239 </list> 222 </list>
240 </option> 223 </option>
241 </component> 224 </component>
@@ -318,9 +301,10 @@ @@ -318,9 +301,10 @@
318 <order /> 301 <order />
319 </component> 302 </component>
320 <component name="ProjectFrameBounds"> 303 <component name="ProjectFrameBounds">
  304 + <option name="x" value="1280" />
321 <option name="y" value="23" /> 305 <option name="y" value="23" />
322 - <option name="width" value="1280" />  
323 - <option name="height" value="732" /> 306 + <option name="width" value="1920" />
  307 + <option name="height" value="1057" />
324 </component> 308 </component>
325 <component name="ProjectLevelVcsManager" settingsEditedManually="false"> 309 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
326 <OptionsSetting value="true" id="Add" /> 310 <OptionsSetting value="true" id="Add" />
@@ -396,6 +380,110 @@ @@ -396,6 +380,110 @@
396 <option name="myItemId" value="main" /> 380 <option name="myItemId" value="main" />
397 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 381 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
398 </PATH_ELEMENT> 382 </PATH_ELEMENT>
  383 + <PATH_ELEMENT>
  384 + <option name="myItemId" value="webapp" />
  385 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  386 + </PATH_ELEMENT>
  387 + </PATH>
  388 + <PATH>
  389 + <PATH_ELEMENT>
  390 + <option name="myItemId" value="patent" />
  391 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  392 + </PATH_ELEMENT>
  393 + <PATH_ELEMENT>
  394 + <option name="myItemId" value="canrd-patent" />
  395 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  396 + </PATH_ELEMENT>
  397 + <PATH_ELEMENT>
  398 + <option name="myItemId" value="src" />
  399 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  400 + </PATH_ELEMENT>
  401 + <PATH_ELEMENT>
  402 + <option name="myItemId" value="main" />
  403 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  404 + </PATH_ELEMENT>
  405 + <PATH_ELEMENT>
  406 + <option name="myItemId" value="webapp" />
  407 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  408 + </PATH_ELEMENT>
  409 + <PATH_ELEMENT>
  410 + <option name="myItemId" value="css" />
  411 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  412 + </PATH_ELEMENT>
  413 + </PATH>
  414 + <PATH>
  415 + <PATH_ELEMENT>
  416 + <option name="myItemId" value="patent" />
  417 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  418 + </PATH_ELEMENT>
  419 + <PATH_ELEMENT>
  420 + <option name="myItemId" value="canrd-patent" />
  421 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  422 + </PATH_ELEMENT>
  423 + <PATH_ELEMENT>
  424 + <option name="myItemId" value="src" />
  425 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  426 + </PATH_ELEMENT>
  427 + <PATH_ELEMENT>
  428 + <option name="myItemId" value="main" />
  429 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  430 + </PATH_ELEMENT>
  431 + </PATH>
  432 + <PATH>
  433 + <PATH_ELEMENT>
  434 + <option name="myItemId" value="patent" />
  435 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  436 + </PATH_ELEMENT>
  437 + <PATH_ELEMENT>
  438 + <option name="myItemId" value="canrd-patent" />
  439 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  440 + </PATH_ELEMENT>
  441 + <PATH_ELEMENT>
  442 + <option name="myItemId" value="src" />
  443 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  444 + </PATH_ELEMENT>
  445 + <PATH_ELEMENT>
  446 + <option name="myItemId" value="main" />
  447 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  448 + </PATH_ELEMENT>
  449 + <PATH_ELEMENT>
  450 + <option name="myItemId" value="java" />
  451 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  452 + </PATH_ELEMENT>
  453 + <PATH_ELEMENT>
  454 + <option name="myItemId" value="patent" />
  455 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  456 + </PATH_ELEMENT>
  457 + <PATH_ELEMENT>
  458 + <option name="myItemId" value="web" />
  459 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  460 + </PATH_ELEMENT>
  461 + </PATH>
  462 + <PATH>
  463 + <PATH_ELEMENT>
  464 + <option name="myItemId" value="patent" />
  465 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  466 + </PATH_ELEMENT>
  467 + <PATH_ELEMENT>
  468 + <option name="myItemId" value="canrd-patent" />
  469 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  470 + </PATH_ELEMENT>
  471 + <PATH_ELEMENT>
  472 + <option name="myItemId" value="src" />
  473 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  474 + </PATH_ELEMENT>
  475 + <PATH_ELEMENT>
  476 + <option name="myItemId" value="main" />
  477 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  478 + </PATH_ELEMENT>
  479 + <PATH_ELEMENT>
  480 + <option name="myItemId" value="java" />
  481 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  482 + </PATH_ELEMENT>
  483 + <PATH_ELEMENT>
  484 + <option name="myItemId" value="patent" />
  485 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  486 + </PATH_ELEMENT>
399 </PATH> 487 </PATH>
400 </subPane> 488 </subPane>
401 </pane> 489 </pane>
@@ -425,9 +513,9 @@ @@ -425,9 +513,9 @@
425 <recent name="com.canrd.patent.web" /> 513 <recent name="com.canrd.patent.web" />
426 </key> 514 </key>
427 <key name="CopyFile.RECENT_KEYS"> 515 <key name="CopyFile.RECENT_KEYS">
428 - <recent name="$PROJECT_DIR$/src/main/webapp" />  
429 - <recent name="$PROJECT_DIR$/src/main/webapp/css" />  
430 <recent name="$PROJECT_DIR$/src/main/webapp/include" /> 516 <recent name="$PROJECT_DIR$/src/main/webapp/include" />
  517 + <recent name="$PROJECT_DIR$/src/main/webapp/css" />
  518 + <recent name="$PROJECT_DIR$/src/main/webapp" />
431 </key> 519 </key>
432 <key name="MoveFile.RECENT_KEYS"> 520 <key name="MoveFile.RECENT_KEYS">
433 <recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" /> 521 <recent name="$PROJECT_DIR$/src/main/webapp/WEB-INF" />
@@ -887,15 +975,15 @@ @@ -887,15 +975,15 @@
887 <workItem from="1469112269396" duration="6881000" /> 975 <workItem from="1469112269396" duration="6881000" />
888 <workItem from="1469242140776" duration="1637000" /> 976 <workItem from="1469242140776" duration="1637000" />
889 <workItem from="1469243959439" duration="3683000" /> 977 <workItem from="1469243959439" duration="3683000" />
890 - <workItem from="1469260205882" duration="7362000" /> 978 + <workItem from="1469260205882" duration="10538000" />
891 </task> 979 </task>
892 <servers /> 980 <servers />
893 </component> 981 </component>
894 <component name="TimeTrackingManager"> 982 <component name="TimeTrackingManager">
895 - <option name="totallyTimeSpent" value="88900000" /> 983 + <option name="totallyTimeSpent" value="92076000" />
896 </component> 984 </component>
897 <component name="ToolWindowManager"> 985 <component name="ToolWindowManager">
898 - <frame x="0" y="23" width="1280" height="732" extended-state="6" /> 986 + <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
899 <editor active="false" /> 987 <editor active="false" />
900 <layout> 988 <layout>
901 <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" /> 989 <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" />
@@ -907,7 +995,7 @@ @@ -907,7 +995,7 @@
907 <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" /> 995 <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" />
908 <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" /> 996 <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" />
909 <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" /> 997 <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" />
910 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5125" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 998 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.47979274" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
911 <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" /> 999 <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" />
912 <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" /> 1000 <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" />
913 <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" /> 1001 <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" />
@@ -915,9 +1003,9 @@ @@ -915,9 +1003,9 @@
915 <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" /> 1003 <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" />
916 <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" /> 1004 <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" />
917 <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" /> 1005 <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" />
918 - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.11793215" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 1006 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.07774228" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
919 <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" /> 1007 <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" />
920 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24151857" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 1008 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22683705" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
921 <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" /> 1009 <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" />
922 <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" /> 1010 <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" />
923 <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" /> 1011 <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" />
@@ -976,90 +1064,6 @@ @@ -976,90 +1064,6 @@
976 <option name="FILTER_TARGETS" value="false" /> 1064 <option name="FILTER_TARGETS" value="false" />
977 </component> 1065 </component>
978 <component name="editorHistoryManager"> 1066 <component name="editorHistoryManager">
979 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java">  
980 - <provider selected="true" editor-type-id="text-editor">  
981 - <state vertical-scroll-proportion="0.0">  
982 - <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />  
983 - <folding>  
984 - <element signature="e#2334#2335#0" expanded="false" />  
985 - <element signature="e#2389#2390#0" expanded="false" />  
986 - </folding>  
987 - </state>  
988 - </provider>  
989 - </entry>  
990 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/standard/StdJson.java">  
991 - <provider selected="true" editor-type-id="text-editor">  
992 - <state vertical-scroll-proportion="0.0">  
993 - <caret line="55" column="24" selection-start-line="55" selection-start-column="24" selection-end-line="55" selection-end-column="24" />  
994 - </state>  
995 - </provider>  
996 - </entry>  
997 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java">  
998 - <provider selected="true" editor-type-id="text-editor">  
999 - <state vertical-scroll-proportion="0.0">  
1000 - <caret line="184" column="20" selection-start-line="184" selection-start-column="20" selection-end-line="184" selection-end-column="20" />  
1001 - </state>  
1002 - </provider>  
1003 - </entry>  
1004 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java">  
1005 - <provider selected="true" editor-type-id="text-editor">  
1006 - <state vertical-scroll-proportion="0.0">  
1007 - <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />  
1008 - </state>  
1009 - </provider>  
1010 - </entry>  
1011 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java">  
1012 - <provider selected="true" editor-type-id="text-editor">  
1013 - <state vertical-scroll-proportion="0.0">  
1014 - <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="16" selection-end-column="31" />  
1015 - <folding />  
1016 - </state>  
1017 - </provider>  
1018 - </entry>  
1019 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java">  
1020 - <provider selected="true" editor-type-id="text-editor">  
1021 - <state vertical-scroll-proportion="0.0">  
1022 - <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />  
1023 - </state>  
1024 - </provider>  
1025 - </entry>  
1026 - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">  
1027 - <provider selected="true" editor-type-id="text-editor">  
1028 - <state vertical-scroll-proportion="0.22900763">  
1029 - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />  
1030 - <folding />  
1031 - </state>  
1032 - </provider>  
1033 - </entry>  
1034 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">  
1035 - <provider selected="true" editor-type-id="text-editor">  
1036 - <state vertical-scroll-proportion="0.13686131">  
1037 - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />  
1038 - </state>  
1039 - </provider>  
1040 - </entry>  
1041 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">  
1042 - <provider selected="true" editor-type-id="text-editor">  
1043 - <state vertical-scroll-proportion="0.3448905">  
1044 - <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />  
1045 - </state>  
1046 - </provider>  
1047 - </entry>  
1048 - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">  
1049 - <provider selected="true" editor-type-id="text-editor">  
1050 - <state vertical-scroll-proportion="-12.5">  
1051 - <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="21" />  
1052 - </state>  
1053 - </provider>  
1054 - </entry>  
1055 - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml">  
1056 - <provider selected="true" editor-type-id="text-editor">  
1057 - <state vertical-scroll-proportion="0.0">  
1058 - <caret line="15" column="43" selection-start-line="15" selection-start-column="43" selection-end-line="15" selection-end-column="43" />  
1059 - <folding />  
1060 - </state>  
1061 - </provider>  
1062 - </entry>  
1063 <entry file="file://$PROJECT_DIR$/doc/manual/开发注意.txt"> 1067 <entry file="file://$PROJECT_DIR$/doc/manual/开发注意.txt">
1064 <provider selected="true" editor-type-id="text-editor"> 1068 <provider selected="true" editor-type-id="text-editor">
1065 <state vertical-scroll-proportion="0.0"> 1069 <state vertical-scroll-proportion="0.0">
@@ -1147,14 +1151,6 @@ @@ -1147,14 +1151,6 @@
1147 </state> 1151 </state>
1148 </provider> 1152 </provider>
1149 </entry> 1153 </entry>
1150 - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">  
1151 - <provider selected="true" editor-type-id="text-editor">  
1152 - <state vertical-scroll-proportion="0.0">  
1153 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1154 - <folding />  
1155 - </state>  
1156 - </provider>  
1157 - </entry>  
1158 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 1154 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
1159 <provider selected="true" editor-type-id="text-editor"> 1155 <provider selected="true" editor-type-id="text-editor">
1160 <state vertical-scroll-proportion="1.2162921"> 1156 <state vertical-scroll-proportion="1.2162921">
@@ -1266,22 +1262,6 @@ @@ -1266,22 +1262,6 @@
1266 </state> 1262 </state>
1267 </provider> 1263 </provider>
1268 </entry> 1264 </entry>
1269 - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">  
1270 - <provider selected="true" editor-type-id="text-editor">  
1271 - <state vertical-scroll-proportion="-16.083334">  
1272 - <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />  
1273 - <folding />  
1274 - </state>  
1275 - </provider>  
1276 - </entry>  
1277 - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">  
1278 - <provider selected="true" editor-type-id="text-editor">  
1279 - <state vertical-scroll-proportion="-6.27451">  
1280 - <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />  
1281 - <folding />  
1282 - </state>  
1283 - </provider>  
1284 - </entry>  
1285 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java"> 1265 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
1286 <provider selected="true" editor-type-id="text-editor"> 1266 <provider selected="true" editor-type-id="text-editor">
1287 <state vertical-scroll-proportion="0.0"> 1267 <state vertical-scroll-proportion="0.0">
@@ -1302,53 +1282,6 @@ @@ -1302,53 +1282,6 @@
1302 </state> 1282 </state>
1303 </provider> 1283 </provider>
1304 </entry> 1284 </entry>
1305 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">  
1306 - <provider selected="true" editor-type-id="text-editor">  
1307 - <state vertical-scroll-proportion="0.0">  
1308 - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />  
1309 - <folding>  
1310 - <element signature="e#2712#2713#0" expanded="true" />  
1311 - <element signature="e#2737#2738#0" expanded="true" />  
1312 - <element signature="e#2989#2990#0" expanded="true" />  
1313 - <element signature="e#3017#3018#0" expanded="true" />  
1314 - <element signature="e#3270#3271#0" expanded="true" />  
1315 - <element signature="e#3297#3298#0" expanded="true" />  
1316 - <element signature="e#3561#3562#0" expanded="true" />  
1317 - <element signature="e#3622#3623#0" expanded="true" />  
1318 - <element signature="e#3883#3884#0" expanded="true" />  
1319 - <element signature="e#3912#3913#0" expanded="true" />  
1320 - <element signature="e#4188#4189#0" expanded="true" />  
1321 - <element signature="e#4255#4256#0" expanded="true" />  
1322 - <element signature="e#4522#4523#0" expanded="true" />  
1323 - <element signature="e#4553#4554#0" expanded="true" />  
1324 - <element signature="e#4839#4840#0" expanded="true" />  
1325 - <element signature="e#4912#4913#0" expanded="true" />  
1326 - <element signature="e#5188#5189#0" expanded="true" />  
1327 - <element signature="e#5222#5223#0" expanded="true" />  
1328 - <element signature="e#5872#5873#0" expanded="true" />  
1329 - <element signature="e#5903#5904#0" expanded="true" />  
1330 - <element signature="e#6189#6190#0" expanded="true" />  
1331 - <element signature="e#6262#6263#0" expanded="true" />  
1332 - <element signature="e#6535#6536#0" expanded="true" />  
1333 - <element signature="e#6568#6569#0" expanded="true" />  
1334 - <element signature="e#6864#6865#0" expanded="true" />  
1335 - <element signature="e#6943#6944#0" expanded="true" />  
1336 - <element signature="e#7203#7204#0" expanded="true" />  
1337 - <element signature="e#7233#7234#0" expanded="true" />  
1338 - <element signature="e#7510#7511#0" expanded="true" />  
1339 - <element signature="e#7548#7549#0" expanded="true" />  
1340 - <element signature="e#7821#7822#0" expanded="true" />  
1341 - <element signature="e#7854#7855#0" expanded="true" />  
1342 - <element signature="e#8150#8151#0" expanded="true" />  
1343 - <element signature="e#8229#8230#0" expanded="true" />  
1344 - <element signature="e#9157#9158#0" expanded="true" />  
1345 - <element signature="e#9190#9191#0" expanded="true" />  
1346 - <element signature="e#9484#9485#0" expanded="true" />  
1347 - <element signature="e#9528#9529#0" expanded="true" />  
1348 - </folding>  
1349 - </state>  
1350 - </provider>  
1351 - </entry>  
1352 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java"> 1285 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
1353 <provider selected="true" editor-type-id="text-editor"> 1286 <provider selected="true" editor-type-id="text-editor">
1354 <state vertical-scroll-proportion="0.0"> 1287 <state vertical-scroll-proportion="0.0">
@@ -1362,47 +1295,52 @@ @@ -1362,47 +1295,52 @@
1362 <state vertical-scroll-proportion="0.0"> 1295 <state vertical-scroll-proportion="0.0">
1363 <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" /> 1296 <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />
1364 <folding> 1297 <folding>
1365 - <element signature="imports" expanded="true" /> 1298 + <element signature="imports" expanded="false" />
1366 </folding> 1299 </folding>
1367 </state> 1300 </state>
1368 </provider> 1301 </provider>
1369 </entry> 1302 </entry>
1370 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java"> 1303 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
1371 <provider selected="true" editor-type-id="text-editor"> 1304 <provider selected="true" editor-type-id="text-editor">
1372 <state vertical-scroll-proportion="0.0"> 1305 <state vertical-scroll-proportion="0.0">
1373 - <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> 1306 + <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
1374 <folding> 1307 <folding>
1375 - <element signature="e#257#258#0" expanded="true" />  
1376 - <element signature="e#293#294#0" expanded="true" />  
1377 - <element signature="e#358#359#0" expanded="true" />  
1378 - <element signature="e#408#409#0" expanded="true" /> 1308 + <element signature="e#415#416#0" expanded="false" />
  1309 + <element signature="e#465#466#0" expanded="false" />
1379 </folding> 1310 </folding>
1380 </state> 1311 </state>
1381 </provider> 1312 </provider>
1382 </entry> 1313 </entry>
1383 - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp"> 1314 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css">
1384 <provider selected="true" editor-type-id="text-editor"> 1315 <provider selected="true" editor-type-id="text-editor">
1385 - <state vertical-scroll-proportion="-31.041666">  
1386 - <caret line="131" column="42" selection-start-line="131" selection-start-column="42" selection-end-line="131" selection-end-column="42" /> 1316 + <state vertical-scroll-proportion="-1.1945702">
  1317 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1387 <folding /> 1318 <folding />
1388 </state> 1319 </state>
1389 </provider> 1320 </provider>
1390 </entry> 1321 </entry>
1391 - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp"> 1322 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
1392 <provider selected="true" editor-type-id="text-editor"> 1323 <provider selected="true" editor-type-id="text-editor">
1393 - <state vertical-scroll-proportion="80.0">  
1394 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1324 + <state vertical-scroll-proportion="-5.0">
  1325 + <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
1395 <folding /> 1326 <folding />
1396 </state> 1327 </state>
1397 </provider> 1328 </provider>
1398 </entry> 1329 </entry>
1399 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java"> 1330 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1400 <provider selected="true" editor-type-id="text-editor"> 1331 <provider selected="true" editor-type-id="text-editor">
1401 <state vertical-scroll-proportion="0.0"> 1332 <state vertical-scroll-proportion="0.0">
1402 - <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> 1333 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
  1334 + <folding />
  1335 + </state>
  1336 + </provider>
  1337 + </entry>
  1338 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java">
  1339 + <provider selected="true" editor-type-id="text-editor">
  1340 + <state vertical-scroll-proportion="0.0">
  1341 + <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
1403 <folding> 1342 <folding>
1404 - <element signature="e#415#416#0" expanded="true" />  
1405 - <element signature="e#465#466#0" expanded="true" /> 1343 + <element signature="imports" expanded="true" />
1406 </folding> 1344 </folding>
1407 </state> 1345 </state>
1408 </provider> 1346 </provider>
@@ -1410,15 +1348,127 @@ @@ -1410,15 +1348,127 @@
1410 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java"> 1348 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
1411 <provider selected="true" editor-type-id="text-editor"> 1349 <provider selected="true" editor-type-id="text-editor">
1412 <state vertical-scroll-proportion="0.0"> 1350 <state vertical-scroll-proportion="0.0">
1413 - <caret line="94" column="47" selection-start-line="94" selection-start-column="35" selection-end-line="94" selection-end-column="47" /> 1351 + <caret line="80" column="58" selection-start-line="80" selection-start-column="58" selection-end-line="80" selection-end-column="58" />
  1352 + <folding />
  1353 + </state>
  1354 + </provider>
  1355 + </entry>
  1356 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css">
  1357 + <provider selected="true" editor-type-id="text-editor">
  1358 + <state vertical-scroll-proportion="0.0">
  1359 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1360 + <folding />
  1361 + </state>
  1362 + </provider>
  1363 + </entry>
  1364 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/user_side.jsp">
  1365 + <provider selected="true" editor-type-id="text-editor">
  1366 + <state vertical-scroll-proportion="-5.0">
  1367 + <caret line="8" column="67" selection-start-line="8" selection-start-column="67" selection-end-line="8" selection-end-column="67" />
  1368 + <folding />
  1369 + </state>
  1370 + </provider>
  1371 + </entry>
  1372 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-detail.css">
  1373 + <provider selected="true" editor-type-id="text-editor">
  1374 + <state vertical-scroll-proportion="0.0">
  1375 + <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
  1376 + <folding />
  1377 + </state>
  1378 + </provider>
  1379 + </entry>
  1380 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/order_detail.css">
  1381 + <provider selected="true" editor-type-id="text-editor">
  1382 + <state vertical-scroll-proportion="0.0">
  1383 + <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
  1384 + <folding />
  1385 + </state>
  1386 + </provider>
  1387 + </entry>
  1388 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">
  1389 + <provider selected="true" editor-type-id="text-editor">
  1390 + <state vertical-scroll-proportion="0.0">
  1391 + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" />
  1392 + <folding />
  1393 + </state>
  1394 + </provider>
  1395 + </entry>
  1396 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
  1397 + <provider selected="true" editor-type-id="text-editor">
  1398 + <state vertical-scroll-proportion="58.75">
  1399 + <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
1414 <folding /> 1400 <folding />
1415 </state> 1401 </state>
1416 </provider> 1402 </provider>
1417 </entry> 1403 </entry>
1418 <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp"> 1404 <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
1419 <provider selected="true" editor-type-id="text-editor"> 1405 <provider selected="true" editor-type-id="text-editor">
1420 - <state vertical-scroll-proportion="1.2269231">  
1421 - <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" /> 1406 + <state vertical-scroll-proportion="-12.5">
  1407 + <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="69" />
  1408 + <folding />
  1409 + </state>
  1410 + </provider>
  1411 + </entry>
  1412 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
  1413 + <provider selected="true" editor-type-id="text-editor">
  1414 + <state vertical-scroll-proportion="-3.75">
  1415 + <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />
  1416 + <folding />
  1417 + </state>
  1418 + </provider>
  1419 + </entry>
  1420 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css">
  1421 + <provider selected="true" editor-type-id="text-editor">
  1422 + <state vertical-scroll-proportion="0.0">
  1423 + <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
  1424 + <folding />
  1425 + </state>
  1426 + </provider>
  1427 + </entry>
  1428 + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
  1429 + <provider selected="true" editor-type-id="text-editor">
  1430 + <state vertical-scroll-proportion="-3.75">
  1431 + <caret line="6" column="64" selection-start-line="6" selection-start-column="64" selection-end-line="6" selection-end-column="64" />
  1432 + <folding />
  1433 + </state>
  1434 + </provider>
  1435 + </entry>
  1436 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  1437 + <provider selected="true" editor-type-id="text-editor">
  1438 + <state vertical-scroll-proportion="-20.625">
  1439 + <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
  1440 + <folding />
  1441 + </state>
  1442 + </provider>
  1443 + </entry>
  1444 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
  1445 + <provider selected="true" editor-type-id="text-editor">
  1446 + <state vertical-scroll-proportion="-18.125">
  1447 + <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="64" />
  1448 + <folding />
  1449 + </state>
  1450 + </provider>
  1451 + </entry>
  1452 + <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp">
  1453 + <provider selected="true" editor-type-id="text-editor">
  1454 + <state vertical-scroll-proportion="26.25">
  1455 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1456 + <folding />
  1457 + </state>
  1458 + </provider>
  1459 + </entry>
  1460 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/patent-index.css">
  1461 + <provider selected="true" editor-type-id="text-editor">
  1462 + <state vertical-scroll-proportion="-7.703704">
  1463 + <caret line="116" column="2" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="2" />
  1464 + <folding />
  1465 + </state>
  1466 + </provider>
  1467 + </entry>
  1468 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
  1469 + <provider selected="true" editor-type-id="text-editor">
  1470 + <state vertical-scroll-proportion="-0.65189874">
  1471 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1422 <folding /> 1472 <folding />
1423 </state> 1473 </state>
1424 </provider> 1474 </provider>
src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java
  View file @4aee6f0
1 package com.canrd.patent.dal.dto; 1 package com.canrd.patent.dal.dto;
2 2
3 import com.canrd.patent.dal.model.Casement; 3 import com.canrd.patent.dal.model.Casement;
  4 +import com.canrd.patent.dal.model.Order;
4 5
5 /** 6 /**
6 * Created by ouyangmao on 16/7/24. 7 * Created by ouyangmao on 16/7/24.
7 */ 8 */
8 -public class OrderOutputDto extends Casement{ 9 +public class OrderOutputDto extends Order{
9 10
10 private CaseOutputDto caseOutputDto; 11 private CaseOutputDto caseOutputDto;
11 12
src/main/java/com/canrd/patent/web/OrderPageController.java
  View file @4aee6f0
@@ -38,7 +38,7 @@ public class OrderPageController { @@ -38,7 +38,7 @@ public class OrderPageController {
38 Order order = orderService.updateOrder(orderId, address, phone, inName, invoice); 38 Order order = orderService.updateOrder(orderId, address, phone, inName, invoice);
39 //跳转到支付宝 39 //跳转到支付宝
40 //暂时直接跳转到支付成功的页面 40 //暂时直接跳转到支付成功的页面
41 - response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+order.getExpense()); 41 + response.sendRedirect("http://localhost:8081/notify_result?orderId="+order.getId()+"&paymentResult=SUCCESS&totalAmount="+order.getExpense()/100);
42 } 42 }
43 43
44 @RequestMapping(value="/notify_result") 44 @RequestMapping(value="/notify_result")
@@ -72,6 +72,25 @@ public class OrderPageController { @@ -72,6 +72,25 @@ public class OrderPageController {
72 ModelAndView modelAndView = new ModelAndView(); 72 ModelAndView modelAndView = new ModelAndView();
73 Order order = orderService.findByOrderId(orderId); 73 Order order = orderService.findByOrderId(orderId);
74 Casement casement = casementService.findById(order.getCaseId()); 74 Casement casement = casementService.findById(order.getCaseId());
  75 + //设置caseOutputDto
  76 + CaseOutputDto caseOutputDto = createCaseOutputDto(casement);
  77 + //设置orderOutputDto
  78 + OrderOutputDto orderOutputDto = new OrderOutputDto();
  79 + orderOutputDto.setId(order.getId());
  80 + orderOutputDto.setQuantity(order.getQuantity());
  81 + orderOutputDto.setExpense(order.getExpense()/100);
  82 + orderOutputDto.setCaseOutputDto(caseOutputDto);
  83 + modelAndView.addObject("order",orderOutputDto);
  84 + modelAndView.setViewName("/order_detail");
  85 + return modelAndView;
  86 + }
  87 +
  88 + /***
  89 + * 设置caseOutputtDto
  90 + * @param casement
  91 + * @return
  92 + */
  93 + private CaseOutputDto createCaseOutputDto(Casement casement) {
75 CaseOutputDto caseOutputDto = new CaseOutputDto(); 94 CaseOutputDto caseOutputDto = new CaseOutputDto();
76 caseOutputDto.setId(casement.getId()); 95 caseOutputDto.setId(casement.getId());
77 caseOutputDto.setName(casement.getName()); 96 caseOutputDto.setName(casement.getName());
@@ -83,17 +102,13 @@ public class OrderPageController { @@ -83,17 +102,13 @@ public class OrderPageController {
83 caseOutputDto.setPaidType(casement.getPaidType()); 102 caseOutputDto.setPaidType(casement.getPaidType());
84 caseOutputDto.setPaidTypeTitle(PaidTypeEnum.valueOf(casement.getPaidType()).getTitle()); 103 caseOutputDto.setPaidTypeTitle(PaidTypeEnum.valueOf(casement.getPaidType()).getTitle());
85 caseOutputDto.setReduceType(casement.getReduceType()); 104 caseOutputDto.setReduceType(casement.getReduceType());
86 - caseOutputDto.setReduceTypeTitle(casement.getReduceType()!=null?ReduceTypeEnum.valueOf(casement.getReduceType()).getTitle():null); 105 + caseOutputDto.setReduceTypeTitle(casement.getReduceType()!=null? ReduceTypeEnum.valueOf(casement.getReduceType()).getTitle():null);
87 caseOutputDto.setContractNum(casement.getCaseSn()); 106 caseOutputDto.setContractNum(casement.getCaseSn());
88 caseOutputDto.setCaseStatus(casement.getCaseStatus()); 107 caseOutputDto.setCaseStatus(casement.getCaseStatus());
89 caseOutputDto.setMemberId(casement.getMemberId()); 108 caseOutputDto.setMemberId(casement.getMemberId());
90 caseOutputDto.setCreateDate(casement.getCreateDate()); 109 caseOutputDto.setCreateDate(casement.getCreateDate());
91 caseOutputDto.setUpdateDate(casement.getUpdateDate()); 110 caseOutputDto.setUpdateDate(casement.getUpdateDate());
92 - OrderOutputDto orderOutputDto = new OrderOutputDto();  
93 - orderOutputDto.setCaseOutputDto(caseOutputDto);  
94 - modelAndView.addObject("order",orderOutputDto);  
95 - modelAndView.setViewName("/order_detail");  
96 - return modelAndView; 111 + return caseOutputDto;
97 } 112 }
98 113
99 /*** 114 /***
@@ -107,23 +122,7 @@ public class OrderPageController { @@ -107,23 +122,7 @@ public class OrderPageController {
107 for(Order order:orderList){ 122 for(Order order:orderList){
108 OrderListOutputDto orderListOutputDto = new OrderListOutputDto(); 123 OrderListOutputDto orderListOutputDto = new OrderListOutputDto();
109 Casement casement = casementService.findById(order.getCaseId()); 124 Casement casement = casementService.findById(order.getCaseId());
110 - CaseOutputDto caseOutputDto = new CaseOutputDto();  
111 - caseOutputDto.setId(casement.getId());  
112 - caseOutputDto.setName(casement.getName());  
113 - caseOutputDto.setCaseSn(casement.getCaseSn());  
114 - caseOutputDto.setCaseType(casement.getCaseType());  
115 - caseOutputDto.setCaseTypeTitle(CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());  
116 - caseOutputDto.setServiceType(casement.getServiceType());  
117 - caseOutputDto.setServiceTypeTitle(ServiceTypeEnum.valueOf(casement.getServiceType()).getTitle());  
118 - caseOutputDto.setPaidType(casement.getPaidType());  
119 - caseOutputDto.setPaidTypeTitle(PaidTypeEnum.valueOf(casement.getPaidType()).getTitle());  
120 - caseOutputDto.setReduceType(casement.getReduceType());  
121 - caseOutputDto.setReduceTypeTitle(casement.getReduceType()!=null?ReduceTypeEnum.valueOf(casement.getReduceType()).getTitle():null);  
122 - caseOutputDto.setContractNum(casement.getCaseSn());  
123 - caseOutputDto.setCaseStatus(casement.getCaseStatus());  
124 - caseOutputDto.setMemberId(casement.getMemberId());  
125 - caseOutputDto.setCreateDate(casement.getCreateDate());  
126 - caseOutputDto.setUpdateDate(casement.getUpdateDate()); 125 + CaseOutputDto caseOutputDto = createCaseOutputDto(casement);
127 orderListOutputDto.setCaseOutputDto(caseOutputDto); 126 orderListOutputDto.setCaseOutputDto(caseOutputDto);
128 orderListOutputDtoList.add(orderListOutputDto); 127 orderListOutputDtoList.add(orderListOutputDto);
129 } 128 }
src/main/webapp/case_detail.jsp
  View file @4aee6f0
@@ -18,22 +18,8 @@ @@ -18,22 +18,8 @@
18 <span class="current">案件管理</span> 18 <span class="current">案件管理</span>
19 </div> 19 </div>
20 <div class="main-wrap"> 20 <div class="main-wrap">
21 - <div class="side-nav">  
22 - <!-- user-side-bar.html -->  
23 - <div class="user-side-bar">  
24 - <div class="user-info">  
25 - <div class="head-ico"></div>  
26 - <p class="user-phone">18354206939</p> 21 + <jsp:include page="/include/user_side.jsp" flush="true"/>
27 22
28 - <div class="edit-btn">编辑</div>  
29 - </div>  
30 - <ul>  
31 - <li data-nav-type="my-cases">我的案件</li>  
32 - <li class="side-nav-selected" data-nav-type="case-manage">案件管理</li>  
33 - <li>案件管理</li>  
34 - </ul>  
35 - </div>  
36 - </div>  
37 <div class="case-detail-wrap"> 23 <div class="case-detail-wrap">
38 <div class="case-status-wrap"> 24 <div class="case-status-wrap">
39 <div class="case-section-wrap"> 25 <div class="case-section-wrap">
src/main/webapp/case_manage.jsp
  View file @4aee6f0
@@ -19,22 +19,8 @@ @@ -19,22 +19,8 @@
19 <span class="current">案件管理</span> 19 <span class="current">案件管理</span>
20 </div> 20 </div>
21 <div class="main-wrap"> 21 <div class="main-wrap">
22 - <div class="side-nav">  
23 - <!-- user-side-bar.html -->  
24 - <div class="user-side-bar">  
25 - <div class="user-info">  
26 - <div class="head-ico"></div>  
27 - <p class="user-phone">18354206939</p> 22 + <jsp:include page="/include/user_side.jsp" flush="true"/>
28 23
29 - <div class="edit-btn">编辑</div>  
30 - </div>  
31 - <ul>  
32 - <li data-nav-type="my-cases">我的案件</li>  
33 - <li class="side-nav-selected" data-nav-type="case-manage">案件管理</li>  
34 - <li>案件管理</li>  
35 - </ul>  
36 - </div>  
37 - </div>  
38 <div class="my-case"> 24 <div class="my-case">
39 <div class="case-statistics"> 25 <div class="case-statistics">
40 <p> 26 <p>
src/main/webapp/css/case-detail.css
  View file @4aee6f0
1 /*case-detail.css*/ 1 /*case-detail.css*/
2 -@charset 'utf-8';  
3 -/*header.css*/  
4 @charset "utf-8"; 2 @charset "utf-8";
5 body { 3 body {
6 width: 100%; 4 width: 100%;
@@ -90,137 +88,6 @@ body { @@ -90,137 +88,6 @@ body {
90 display: none; 88 display: none;
91 } 89 }
92 90
93 -/*user-side-bar*/  
94 -  
95 -/*user-side-bar.css*/  
96 -  
97 -.case-manage-wrap {  
98 - position: relative;  
99 - width: 100%;  
100 - height: auto;  
101 - background-color: #f9f9f9;  
102 - border-top: 4px solid #1287cd;  
103 - color: #646464;  
104 -}  
105 -  
106 -.case-manage-wrap .content {  
107 - position: relative;  
108 - width: 1000px;  
109 - height: auto;  
110 - margin: 0 auto;  
111 -}  
112 -  
113 -.location-wrap {  
114 - position: relative;  
115 - height: 40px;  
116 - line-height: 40px;  
117 - font-size: 12px;  
118 -}  
119 -  
120 -.row-right {  
121 - display: inline-block;  
122 - width: 5px;  
123 - height: 1em;  
124 - background-image: url(/img/case-manage-icon-colle.png);  
125 - background-repeat: no-repeat;  
126 - background-position: 0 4px;  
127 -}  
128 -  
129 -.location-wrap span {  
130 - cursor: pointer;  
131 -}  
132 -.location-wrap span.current {  
133 - color: #1282cd;  
134 -}  
135 -  
136 -.main-wrap {  
137 - overflow: hidden;  
138 - margin-bottom: 100px;  
139 -}  
140 -  
141 -  
142 -  
143 -.side-nav {  
144 - position: relative;  
145 - width: 170px;  
146 - height: auto;  
147 - background-color: #ffffff;  
148 - float: left;  
149 -}  
150 -  
151 -.user-info {  
152 - width: inherit;  
153 - height: 140px;  
154 -}  
155 -  
156 -.head-ico {  
157 - position: relative;  
158 - width: 60px;  
159 - height: 60px;  
160 - background-image: url(/img/default-head-ico.png);  
161 - margin: 0 auto;  
162 - margin-top: 20px;  
163 - cursor: pointer;  
164 - -o-border-radius: 100%;  
165 - -webkit-border-radius: 100%;  
166 - -ms-border-radius: 100%;  
167 - -moz-border-radius: 100%;  
168 - border-radius: 100%;  
169 - overflow: hidden;  
170 -}  
171 -  
172 -.head-ico:hover{  
173 - -o-box-shadow: 0px 0px 5px 0px;  
174 - -webkit-box-shadow: 0px 0px 5px 0px;  
175 - -ms-box-shadow: 0px 0px 5px 0px;  
176 - -moz-box-shadow: 0px 0px 5px 0px;  
177 - box-shadow: 0px 0px 5px 0px;  
178 -}  
179 -  
180 -.user-phone {  
181 - text-align: center;  
182 -}  
183 -  
184 -.edit-btn {  
185 - position: relative;  
186 - width: 50px;  
187 - height: 20px;  
188 - line-height: 20px;  
189 - text-align: center;  
190 - background-color: #f97c5f;  
191 - color: #fff;  
192 - margin: 0 auto;  
193 - font-size: 14px;  
194 - -webkit-border-radius: 16px;  
195 - -o-border-radius: 16px;  
196 - -moz-border-radius: 16px;  
197 - -ms-border-radius: 16px;  
198 - border-radius: 16px;  
199 - cursor: pointer;  
200 -}  
201 -  
202 -.user-side-bar li {  
203 - height: 50px;  
204 - line-height: 50px;  
205 - text-align: center;  
206 - border-bottom: 1px dotted #a0a0a0;  
207 - font-size: 14px;  
208 - cursor: pointer;  
209 -}  
210 -  
211 -.user-side-bar li:first-child {  
212 - border-top: 1px dotted #a0a0a0;  
213 -}  
214 -  
215 -.user-side-bar li:last-child {  
216 - border-bottom: none;  
217 -}  
218 -  
219 -.user-side-bar .side-nav-selected {  
220 - color: #1287cd;  
221 - border-bottom: 1px dotted #1287cd;  
222 -}  
223 -  
224 /*case-detail-wrap*/ 91 /*case-detail-wrap*/
225 .case-detail-wrap { 92 .case-detail-wrap {
226 position: relative; 93 position: relative;
@@ -472,97 +339,4 @@ body { @@ -472,97 +339,4 @@ body {
472 background-color: #1278cd; 339 background-color: #1278cd;
473 color: #ffffff; 340 color: #ffffff;
474 padding: 4px 8px; 341 padding: 4px 8px;
475 -}  
476 -  
477 -/*footer.css*/  
478 -.footer {  
479 - width: 100%;  
480 - height: auto;  
481 - background-color: #3c3c3c  
482 -}  
483 -  
484 -.footer a:hover {  
485 - color: #1287cd  
486 -}  
487 -  
488 -.canrd-site-map {  
489 - position: relative;  
490 - width: 1000px;  
491 - height: 320px;  
492 - margin: 0 auto;  
493 - padding-top: 50px;  
494 -}  
495 -  
496 -dl, dd {  
497 - margin: 0  
498 -}  
499 -  
500 -.canrd-site-map dl {  
501 - width: 200px;  
502 - color: #ffffff;  
503 - float: left;  
504 - clear: right;  
505 -}  
506 -  
507 -.canrd-site-map dt {  
508 - font-size: 18px;  
509 -  
510 -}  
511 -  
512 -.canrd-site-map dd {  
513 - margin: 25px auto;  
514 - font-size: 14px;  
515 - color: #C3C5C6;  
516 -}  
517 -  
518 -.canrd-site-map dd a {  
519 - color: #C3C5C6;  
520 -}  
521 -  
522 -.canrd-site-map .follow-us {  
523 - width: 330px;  
524 - margin-left: 50px;  
525 -}  
526 -  
527 -.contact-detail{  
528 - margin-left: 2em;  
529 -}  
530 -  
531 -.follow-us div {  
532 - overflow: hidden;  
533 -}  
534 -  
535 -.follow-us div dd {  
536 - margin-bottom: 0;  
537 -}  
538 -  
539 -.follow-us .time {  
540 - font-size: 12px;  
541 -}  
542 -  
543 -.canrd-site-map .site-addr {  
544 - margin-top:18px;  
545 -}  
546 -  
547 -.canrd-site-map .barcode {  
548 - float: left;  
549 - margin-right: 20px;  
550 -}  
551 -  
552 -.friendly-link {  
553 - width: 100%;  
554 - height: 70px;  
555 - line-height: 70px;  
556 - text-align: center;  
557 - background-color: #313131;  
558 - font-size: 14px;  
559 -}  
560 -  
561 -.friendly-link span {  
562 - color: #646464;  
563 -}  
564 -  
565 -.friendly-link a {  
566 - color: #c3c5c6;  
567 - margin-left: 20px;  
568 } 342 }
569 \ No newline at end of file 343 \ No newline at end of file
src/main/webapp/css/case-manage.css
  View file @4aee6f0
@@ -34,190 +34,11 @@ ul { @@ -34,190 +34,11 @@ ul {
34 li { 34 li {
35 list-style: none; 35 list-style: none;
36 } 36 }
37 -  
38 -.header {  
39 - width: 100%;  
40 - height: 70px;  
41 - background-color: #ffffff;  
42 -}  
43 -  
44 -.header-bar {  
45 - position: relative;  
46 - width: 1000px;  
47 - height: 70px;  
48 - margin: 0 auto;  
49 -}  
50 -  
51 -.logo {  
52 - display: inline-block;  
53 - width: auto;  
54 - height: auto;  
55 - float: left;  
56 - margin-top: 5.5px;  
57 -}  
58 -  
59 -.nav {  
60 - display: inline-block;  
61 - height: 70px;  
62 - line-height: 70px;  
63 - margin-left: 150px;  
64 -}  
65 -  
66 -.nav li {  
67 - display: inline-block;  
68 - float: left;  
69 - margin: 0 26px;  
70 -}  
71 -  
72 -.nav li a {  
73 - display: inline-block;  
74 - height: 70px;  
75 -}  
76 -  
77 -.nav li a:hover {  
78 - height: 66px;  
79 - border-bottom: 4px solid #1287cd;  
80 -}  
81 -  
82 -.nav-active {  
83 - height: 66px;  
84 - border-bottom: 4px solid #1287cd;  
85 -}  
86 body { 37 body {
87 background-color: #f9f9f9; 38 background-color: #f9f9f9;
88 } 39 }
89 40
90 41
91 -  
92 -/*user-side-bar*/  
93 -/*user-side-bar.css*/  
94 -  
95 -.case-manage-wrap {  
96 - position: relative;  
97 - width: 100%;  
98 - height: auto;  
99 - background-color: #f9f9f9;  
100 - border-top: 4px solid #1287cd;  
101 - color: #646464;  
102 -}  
103 -  
104 -.case-manage-wrap .content {  
105 - position: relative;  
106 - width: 1000px;  
107 - height: auto;  
108 - margin: 0 auto;  
109 -}  
110 -  
111 -.location-wrap {  
112 - position: relative;  
113 - height: 40px;  
114 - line-height: 40px;  
115 - font-size: 12px;  
116 -}  
117 -  
118 -.row-right {  
119 - display: inline-block;  
120 - width: 5px;  
121 - height: 1em;  
122 - background-image: url(/img/case-manage-icon-colle.png);  
123 - background-repeat: no-repeat;  
124 - background-position: 0 4px;  
125 -}  
126 -  
127 -.location-wrap span {  
128 - cursor: pointer;  
129 -}  
130 -.location-wrap span.current {  
131 - color: #1282cd;  
132 -}  
133 -  
134 -.main-wrap {  
135 - overflow: hidden;  
136 - margin-bottom: 100px;  
137 -}  
138 -  
139 -  
140 -  
141 -.side-nav {  
142 - position: relative;  
143 - width: 170px;  
144 - height: auto;  
145 - background-color: #ffffff;  
146 - float: left;  
147 -}  
148 -  
149 -.user-info {  
150 - width: inherit;  
151 - height: 140px;  
152 -}  
153 -  
154 -.head-ico {  
155 - position: relative;  
156 - width: 60px;  
157 - height: 60px;  
158 - background-image: url(/img/default-head-ico.png);  
159 - margin: 0 auto;  
160 - margin-top: 20px;  
161 - cursor: pointer;  
162 - -o-border-radius: 100%;  
163 - -webkit-border-radius: 100%;  
164 - -ms-border-radius: 100%;  
165 - -moz-border-radius: 100%;  
166 - border-radius: 100%;  
167 - overflow: hidden;  
168 -}  
169 -  
170 -.head-ico:hover{  
171 - -o-box-shadow: 0px 0px 5px 0px;  
172 - -webkit-box-shadow: 0px 0px 5px 0px;  
173 - -ms-box-shadow: 0px 0px 5px 0px;  
174 - -moz-box-shadow: 0px 0px 5px 0px;  
175 - box-shadow: 0px 0px 5px 0px;  
176 -}  
177 -  
178 -.user-phone {  
179 - text-align: center;  
180 -}  
181 -  
182 -.edit-btn {  
183 - position: relative;  
184 - width: 50px;  
185 - height: 20px;  
186 - line-height: 20px;  
187 - text-align: center;  
188 - background-color: #f97c5f;  
189 - color: #fff;  
190 - margin: 0 auto;  
191 - font-size: 14px;  
192 - -webkit-border-radius: 16px;  
193 - -o-border-radius: 16px;  
194 - -moz-border-radius: 16px;  
195 - -ms-border-radius: 16px;  
196 - border-radius: 16px;  
197 - cursor: pointer;  
198 -}  
199 -  
200 -.user-side-bar li {  
201 - height: 50px;  
202 - line-height: 50px;  
203 - text-align: center;  
204 - border-bottom: 1px dotted #a0a0a0;  
205 - font-size: 14px;  
206 - cursor: pointer;  
207 -}  
208 -  
209 -.user-side-bar li:first-child {  
210 - border-top: 1px dotted #a0a0a0;  
211 -}  
212 -  
213 -.user-side-bar li:last-child {  
214 - border-bottom: none;  
215 -}  
216 -  
217 -.user-side-bar .side-nav-selected {  
218 - color: #1287cd;  
219 - border-bottom: 1px dotted #1287cd;  
220 -}  
221 .my-case { 42 .my-case {
222 position: relative; 43 position: relative;
223 width: 810px; 44 width: 810px;
@@ -369,96 +190,3 @@ td&gt;div { @@ -369,96 +190,3 @@ td&gt;div {
369 padding-left: 20px; 190 padding-left: 20px;
370 cursor: pointer; 191 cursor: pointer;
371 } 192 }
372 -  
373 -/*footer.css*/  
374 -.footer {  
375 - width: 100%;  
376 - height: auto;  
377 - background-color: #3c3c3c  
378 -}  
379 -  
380 -.footer a:hover {  
381 - color: #1287cd  
382 -}  
383 -  
384 -.canrd-site-map {  
385 - position: relative;  
386 - width: 1000px;  
387 - height: 320px;  
388 - margin: 0 auto;  
389 - padding-top: 50px;  
390 -}  
391 -  
392 -dl, dd {  
393 - margin: 0  
394 -}  
395 -  
396 -.canrd-site-map dl {  
397 - width: 200px;  
398 - color: #ffffff;  
399 - float: left;  
400 - clear: right;  
401 -}  
402 -  
403 -.canrd-site-map dt {  
404 - font-size: 18px;  
405 -  
406 -}  
407 -  
408 -.canrd-site-map dd {  
409 - margin: 25px auto;  
410 - font-size: 14px;  
411 - color: #C3C5C6;  
412 -}  
413 -  
414 -.canrd-site-map dd a {  
415 - color: #C3C5C6;  
416 -}  
417 -  
418 -.canrd-site-map .follow-us {  
419 - width: 330px;  
420 - margin-left: 50px;  
421 -}  
422 -  
423 -.contact-detail{  
424 - margin-left: 2em;  
425 -}  
426 -  
427 -.follow-us div {  
428 - overflow: hidden;  
429 -}  
430 -  
431 -.follow-us div dd {  
432 - margin-bottom: 0;  
433 -}  
434 -  
435 -.follow-us .time {  
436 - font-size: 12px;  
437 -}  
438 -  
439 -.canrd-site-map .site-addr {  
440 - margin-top:18px;  
441 -}  
442 -  
443 -.canrd-site-map .barcode {  
444 - float: left;  
445 - margin-right: 20px;  
446 -}  
447 -  
448 -.friendly-link {  
449 - width: 100%;  
450 - height: 70px;  
451 - line-height: 70px;  
452 - text-align: center;  
453 - background-color: #313131;  
454 - font-size: 14px;  
455 -}  
456 -  
457 -.friendly-link span {  
458 - color: #646464;  
459 -}  
460 -  
461 -.friendly-link a {  
462 - color: #c3c5c6;  
463 - margin-left: 20px;  
464 -}  
src/main/webapp/css/order_detail.css 0 → 100644
  View file @4aee6f0
  1 +/*case-manage.css*/
  2 +/*header.css*/
  3 +@charset "utf-8";
  4 +body {
  5 + width: 100%;
  6 + height: auto;
  7 + margin: 0;
  8 + padding: 0;
  9 + font: 16px 'Hiragino Sans GB', 'Microsoft YaHei', 微软雅黑, arial, Tahoma, SimSun, sans-serif;
  10 +}
  11 +
  12 +input,
  13 +textarea,
  14 +option {
  15 + font-family:'Hiragino Sans GB', 'Microsoft YaHei', 微软雅黑, arial, Tahoma, SimSun, sans-serif;
  16 +}
  17 +
  18 +a {
  19 + text-decoration: none;
  20 + color: #646464
  21 +}
  22 +
  23 +a:hover {
  24 + color: #1287cd
  25 +}
  26 +
  27 +ul {
  28 + margin: 0;
  29 + padding: 0;
  30 +}
  31 +
  32 +li {
  33 + list-style: none;
  34 +}
  35 +
  36 +.case-content {
  37 + position: relative;
  38 + width: 810px;
  39 + min-height: 350px;
  40 + background-color: #ffffff;
  41 + float: right;
  42 + border:1px solid black;
  43 +}
src/main/webapp/css/zhuanli-index.css renamed to src/main/webapp/css/patent-index.css
  View file @4aee6f0
@@ -34,55 +34,6 @@ li { @@ -34,55 +34,6 @@ li {
34 list-style: none; 34 list-style: none;
35 } 35 }
36 36
37 -.header {  
38 - width: 100%;  
39 - height: 70px;  
40 - background-color: #ffffff;  
41 -}  
42 -  
43 -.header .header-bar {  
44 - position: relative;  
45 - width: 1000px;  
46 - height: 70px;  
47 - margin: 0 auto;  
48 -}  
49 -  
50 -.header .header-bar .logo {  
51 - display: inline-block;  
52 - width: auto;  
53 - height: auto;  
54 - float: left;  
55 - margin-top: 5.5px;  
56 -}  
57 -  
58 -.header .header-bar .nav {  
59 - display: inline-block;  
60 - height: 70px;  
61 - line-height: 70px;  
62 - margin-left: 150px;  
63 -}  
64 -  
65 -.header .header-bar .nav li {  
66 - display: inline-block;  
67 - float: left;  
68 - margin: 0 26px;  
69 -}  
70 -  
71 -.header .header-bar .nav li a {  
72 - display: inline-block;  
73 - height: 70px;  
74 -}  
75 -  
76 -.header .header-bar .nav li a:hover {  
77 - height: 66px;  
78 - border-bottom: 4px solid #1287cd;  
79 -}  
80 -  
81 -.header .header-bar .nav li.nav-active {  
82 - height: 66px;  
83 - border-bottom: 4px solid #1287cd;  
84 -}  
85 -  
86 .banner{ 37 .banner{
87 width: 100%; 38 width: 100%;
88 } 39 }
@@ -90,98 +41,7 @@ li { @@ -90,98 +41,7 @@ li {
90 width: 100%; 41 width: 100%;
91 } 42 }
92 43
93 -/*footer.css*/  
94 -.footer {  
95 - width: 100%;  
96 - height: auto;  
97 - background-color: #3c3c3c  
98 -}  
99 -  
100 -.footer a:hover {  
101 - color: #1287cd  
102 -}  
103 -  
104 -.canrd-site-map {  
105 - position: relative;  
106 - width: 1000px;  
107 - height: 320px;  
108 - margin: 0 auto;  
109 - padding-top: 50px;  
110 -}  
111 -  
112 -dl, dd {  
113 - margin: 0  
114 -}  
115 -  
116 -.canrd-site-map dl {  
117 - width: 200px;  
118 - color: #ffffff;  
119 - float: left;  
120 - clear: right;  
121 -}  
122 -  
123 -.canrd-site-map dt {  
124 - font-size: 18px;  
125 -  
126 -}  
127 -  
128 -.canrd-site-map dd {  
129 - margin: 25px auto;  
130 - font-size: 14px;  
131 - color: #C3C5C6;  
132 -}  
133 -  
134 -.canrd-site-map dd a {  
135 - color: #C3C5C6;  
136 -}  
137 -  
138 -.canrd-site-map .follow-us {  
139 - width: 330px;  
140 - margin-left: 50px;  
141 -}  
142 -  
143 -.contact-detail{  
144 - margin-left: 2em;  
145 -}  
146 -  
147 -.follow-us div {  
148 - overflow: hidden;  
149 -}  
150 -  
151 -.follow-us div dd {  
152 - margin-bottom: 0;  
153 -}  
154 -  
155 -.follow-us .time {  
156 - font-size: 12px;  
157 -}  
158 -  
159 -.canrd-site-map .site-addr {  
160 - margin-top:18px;  
161 -}  
162 -  
163 -.canrd-site-map .barcode {  
164 - float: left;  
165 - margin-right: 20px;  
166 -}  
167 -  
168 -.friendly-link {  
169 - width: 100%;  
170 - height: 70px;  
171 - line-height: 70px;  
172 - text-align: center;  
173 - background-color: #313131;  
174 - font-size: 14px;  
175 -}  
176 -  
177 -.friendly-link span {  
178 - color: #646464;  
179 -}  
180 44
181 -.friendly-link a {  
182 - color: #c3c5c6;  
183 - margin-left: 20px;  
184 -}  
185 45
186 @charset "utf-8"; 46 @charset "utf-8";
187 .content { 47 .content {
@@ -295,34 +155,34 @@ dl, dd { @@ -295,34 +155,34 @@ dl, dd {
295 155
296 /*科路得优势*/ 156 /*科路得优势*/
297 157
298 -.youshi { 158 +.advantage {
299 position: relative; 159 position: relative;
300 width: 1000px; 160 width: 1000px;
301 height: 560px; 161 height: 560px;
302 margin: 0 auto; 162 margin: 0 auto;
303 } 163 }
304 164
305 -.youshi .item-title { 165 +.advantage .item-title {
306 position: relative; 166 position: relative;
307 top: 75px; 167 top: 75px;
308 } 168 }
309 169
310 -.youshi-list { 170 +.advantage-list {
311 position: relative; 171 position: relative;
312 top: 175px; 172 top: 175px;
313 } 173 }
314 174
315 -.youshi-list li { 175 +.advantage-list li {
316 width: 200px; 176 width: 200px;
317 height: auto; 177 height: auto;
318 float: left; 178 float: left;
319 } 179 }
320 180
321 -.youshi-list li div { 181 +.advantage-list li div {
322 text-align: center; 182 text-align: center;
323 } 183 }
324 184
325 -.youshi-list .icon { 185 +.advantage-list .icon {
326 display: inline-block; 186 display: inline-block;
327 width: 150px; 187 width: 150px;
328 height: 150px; 188 height: 150px;
@@ -350,14 +210,14 @@ dl, dd { @@ -350,14 +210,14 @@ dl, dd {
350 background-position: -847px 0; 210 background-position: -847px 0;
351 } 211 }
352 212
353 -.youshi-list .title { 213 +.advantage-list .title {
354 display: inline-block; 214 display: inline-block;
355 color: #1287cd; 215 color: #1287cd;
356 font-size: 20px; 216 font-size: 20px;
357 margin: 25px auto; 217 margin: 25px auto;
358 } 218 }
359 219
360 -.youshi-list .detail { 220 +.advantage-list .detail {
361 font-size: 12px; 221 font-size: 12px;
362 color: #686767; 222 color: #686767;
363 } 223 }
@@ -425,26 +285,26 @@ dl, dd { @@ -425,26 +285,26 @@ dl, dd {
425 .num3 { 285 .num3 {
426 background-position: 0px -130px; 286 background-position: 0px -130px;
427 } 287 }
428 -  
429 -.zhixun-wrap { 288 +/*咨询*/
  289 +.consult-wrap {
430 width: 100%; 290 width: 100%;
431 height: 600px; 291 height: 600px;
432 background-color: #f8f8f8; 292 background-color: #f8f8f8;
433 } 293 }
434 294
435 -.zhixun { 295 +.consult {
436 position: relative; 296 position: relative;
437 width: 1000px; 297 width: 1000px;
438 height: auto; 298 height: auto;
439 margin: 0 auto; 299 margin: 0 auto;
440 } 300 }
441 301
442 -.zhixun .item-title { 302 +.consult .item-title {
443 position: relative; 303 position: relative;
444 top: 50px; 304 top: 50px;
445 } 305 }
446 306
447 -.zhixun-form { 307 +.consult-form {
448 position: relative; 308 position: relative;
449 width: 100%; 309 width: 100%;
450 height: auto; 310 height: auto;
@@ -485,7 +345,7 @@ dl, dd { @@ -485,7 +345,7 @@ dl, dd {
485 margin: 15px auto; 345 margin: 15px auto;
486 } 346 }
487 347
488 -.zhixun-form input { 348 +.consult-form input {
489 width: 200px; 349 width: 200px;
490 height: 2.5em; 350 height: 2.5em;
491 border: 1px solid #1287cd; 351 border: 1px solid #1287cd;
@@ -500,7 +360,7 @@ dl, dd { @@ -500,7 +360,7 @@ dl, dd {
500 font-size: 14px; 360 font-size: 14px;
501 } 361 }
502 362
503 -.zhixun-form .basic { 363 +.consult-form .basic {
504 width: 456px; 364 width: 456px;
505 } 365 }
506 366
@@ -508,7 +368,7 @@ dl, dd { @@ -508,7 +368,7 @@ dl, dd {
508 margin-top: 35px; 368 margin-top: 35px;
509 } 369 }
510 370
511 -.zhixun-form .search-input { 371 +.consult-form .search-input {
512 width: 225px; 372 width: 225px;
513 } 373 }
514 374
src/main/webapp/css/user-side-bar.css renamed to src/main/webapp/css/user_side_bar.css
  View file @4aee6f0
src/main/webapp/include/user_side.jsp 0 → 100644
  View file @4aee6f0
  1 +<%--
  2 + Created by IntelliJ IDEA.
  3 + User: ouyangmao
  4 + Date: 16/7/12
  5 + Time: 下午1:35
  6 + To change this template use File | Settings | File Templates.
  7 +--%>
  8 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  9 +<link rel="stylesheet" type="text/css" href="/css/user_side_bar.css">
  10 +<div class="side-nav">
  11 + <!-- user-side-bar.html -->
  12 + <div class="user-side-bar">
  13 + <div class="user-info">
  14 + <div class="head-ico"></div>
  15 + <p class="user-phone">18354206939</p>
  16 +
  17 + <div class="edit-btn">编辑</div>
  18 + </div>
  19 + <ul>
  20 + <li data-nav-type="my-cases">我的案件</li>
  21 + <li class="side-nav-selected" data-nav-type="case-manage">案件管理</li>
  22 + <li>案件管理</li>
  23 + </ul>
  24 + </div>
  25 +</div>
0 \ No newline at end of file 26 \ No newline at end of file
src/main/webapp/index.jsp
  View file @4aee6f0
@@ -12,12 +12,12 @@ @@ -12,12 +12,12 @@
12 <div class="banner"> 12 <div class="banner">
13 <img src="/img/banner.png" alt="" class="banner-img" alt=""> 13 <img src="/img/banner.png" alt="" class="banner-img" alt="">
14 </div> 14 </div>
15 -<div class="zhixun-wrap">  
16 - <div class="zhixun"> 15 +<div class="consult-wrap">
  16 + <div class="consult">
17 <div class="item-title"> 17 <div class="item-title">
18 <img src="/img/refer-title.png"> 18 <img src="/img/refer-title.png">
19 </div> 19 </div>
20 - <form class="zhixun-form"> 20 + <form class="consult-form">
21 <div> 21 <div>
22 <div><label class="search-item">专利基础知识咨询</label></div> 22 <div><label class="search-item">专利基础知识咨询</label></div>
23 <input type="text" name="tel-number" placeholder="请输入手机号码" class="basic" id="basic"> <span 23 <input type="text" name="tel-number" placeholder="请输入手机号码" class="basic" id="basic"> <span
@@ -89,11 +89,11 @@ @@ -89,11 +89,11 @@
89 </div> 89 </div>
90 </div> 90 </div>
91 <div class="youshi-wrap"> 91 <div class="youshi-wrap">
92 - <div class="youshi"> 92 + <div class="advantage">
93 <div class="item-title"> 93 <div class="item-title">
94 <img src="/img/keludeyoushi.png" alt="科路得优势"> 94 <img src="/img/keludeyoushi.png" alt="科路得优势">
95 </div> 95 </div>
96 - <ul class="youshi-list"> 96 + <ul class="advantage-list">
97 <li> 97 <li>
98 <div> 98 <div>
99 <span class="icon kuaijie"></span> 99 <span class="icon kuaijie"></span>
src/main/webapp/order_detail.jsp
  View file @4aee6f0
  1 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 2 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
2 <html lang="en"> 3 <html lang="en">
3 -  
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6 <title>科路得</title> 6 <title>科路得</title>
7 - <style type="text/css">  
8 - *{  
9 - margin:0 auto;  
10 - padding: 0;  
11 - }  
12 - .content{  
13 - min-height: 200px;  
14 - }  
15 - .content .show{  
16 - margin-top:20px;  
17 - width: 32%;  
18 - }  
19 - </style> 7 + <link rel="stylesheet" type="text/css" href="/css/order_detail.css">
20 </head> 8 </head>
21 9
22 <body> 10 <body>
23 <jsp:include page="/include/header.jsp" flush="true"/> 11 <jsp:include page="/include/header.jsp" flush="true"/>
24 -  
25 -<div class="content">  
26 - <div class="show">  
27 - <p>订单ID: ${order.id}</p> 12 +<div class="case-manage-wrap">
  13 + <div class="content">
  14 + <div class="location-wrap">
  15 + <span>个人中心</span>
  16 + <i class="row-right"></i>
  17 + <i class="row-right"></i>
  18 + <span class="current">案件管理</span>
  19 + </div>
  20 + <div class="main-wrap">
  21 + <jsp:include page="/include/user_side.jsp" flush="true"/>
  22 + <div class="case-content">
  23 + <p>订单ID: ${order.id}</p>
  24 + </div>
  25 + </div>
28 </div> 26 </div>
29 </div> 27 </div>
30 -  
31 <jsp:include page="/include/footer.jsp" flush="true"/> 28 <jsp:include page="/include/footer.jsp" flush="true"/>
  29 +<script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
32 </body> 30 </body>
33 </html> 31 </html>
target/classes/com/canrd/patent/web/OrderPageController.class
View file @4aee6f0
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class
View file @4aee6f0
No preview for this file type
target/patent/css/case-detail.css
  View file @4aee6f0
1 /*case-detail.css*/ 1 /*case-detail.css*/
2 -@charset 'utf-8';  
3 -/*header.css*/  
4 @charset "utf-8"; 2 @charset "utf-8";
5 body { 3 body {
6 width: 100%; 4 width: 100%;
@@ -90,137 +88,6 @@ body { @@ -90,137 +88,6 @@ body {
90 display: none; 88 display: none;
91 } 89 }
92 90
93 -/*user-side-bar*/  
94 -  
95 -/*user-side-bar.css*/  
96 -  
97 -.case-manage-wrap {  
98 - position: relative;  
99 - width: 100%;  
100 - height: auto;  
101 - background-color: #f9f9f9;  
102 - border-top: 4px solid #1287cd;  
103 - color: #646464;  
104 -}  
105 -  
106 -.case-manage-wrap .content {  
107 - position: relative;  
108 - width: 1000px;  
109 - height: auto;  
110 - margin: 0 auto;  
111 -}  
112 -  
113 -.location-wrap {  
114 - position: relative;  
115 - height: 40px;  
116 - line-height: 40px;  
117 - font-size: 12px;  
118 -}  
119 -  
120 -.row-right {  
121 - display: inline-block;  
122 - width: 5px;  
123 - height: 1em;  
124 - background-image: url(/img/case-manage-icon-colle.png);  
125 - background-repeat: no-repeat;  
126 - background-position: 0 4px;  
127 -}  
128 -  
129 -.location-wrap span {  
130 - cursor: pointer;  
131 -}  
132 -.location-wrap span.current {  
133 - color: #1282cd;  
134 -}  
135 -  
136 -.main-wrap {  
137 - overflow: hidden;  
138 - margin-bottom: 100px;  
139 -}  
140 -  
141 -  
142 -  
143 -.side-nav {  
144 - position: relative;  
145 - width: 170px;  
146 - height: auto;  
147 - background-color: #ffffff;  
148 - float: left;  
149 -}  
150 -  
151 -.user-info {  
152 - width: inherit;  
153 - height: 140px;  
154 -}  
155 -  
156 -.head-ico {  
157 - position: relative;  
158 - width: 60px;  
159 - height: 60px;  
160 - background-image: url(/img/default-head-ico.png);  
161 - margin: 0 auto;  
162 - margin-top: 20px;  
163 - cursor: pointer;  
164 - -o-border-radius: 100%;  
165 - -webkit-border-radius: 100%;  
166 - -ms-border-radius: 100%;  
167 - -moz-border-radius: 100%;  
168 - border-radius: 100%;  
169 - overflow: hidden;  
170 -}  
171 -  
172 -.head-ico:hover{  
173 - -o-box-shadow: 0px 0px 5px 0px;  
174 - -webkit-box-shadow: 0px 0px 5px 0px;  
175 - -ms-box-shadow: 0px 0px 5px 0px;  
176 - -moz-box-shadow: 0px 0px 5px 0px;  
177 - box-shadow: 0px 0px 5px 0px;  
178 -}  
179 -  
180 -.user-phone {  
181 - text-align: center;  
182 -}  
183 -  
184 -.edit-btn {  
185 - position: relative;  
186 - width: 50px;  
187 - height: 20px;  
188 - line-height: 20px;  
189 - text-align: center;  
190 - background-color: #f97c5f;  
191 - color: #fff;  
192 - margin: 0 auto;  
193 - font-size: 14px;  
194 - -webkit-border-radius: 16px;  
195 - -o-border-radius: 16px;  
196 - -moz-border-radius: 16px;  
197 - -ms-border-radius: 16px;  
198 - border-radius: 16px;  
199 - cursor: pointer;  
200 -}  
201 -  
202 -.user-side-bar li {  
203 - height: 50px;  
204 - line-height: 50px;  
205 - text-align: center;  
206 - border-bottom: 1px dotted #a0a0a0;  
207 - font-size: 14px;  
208 - cursor: pointer;  
209 -}  
210 -  
211 -.user-side-bar li:first-child {  
212 - border-top: 1px dotted #a0a0a0;  
213 -}  
214 -  
215 -.user-side-bar li:last-child {  
216 - border-bottom: none;  
217 -}  
218 -  
219 -.user-side-bar .side-nav-selected {  
220 - color: #1287cd;  
221 - border-bottom: 1px dotted #1287cd;  
222 -}  
223 -  
224 /*case-detail-wrap*/ 91 /*case-detail-wrap*/
225 .case-detail-wrap { 92 .case-detail-wrap {
226 position: relative; 93 position: relative;
@@ -472,97 +339,4 @@ body { @@ -472,97 +339,4 @@ body {
472 background-color: #1278cd; 339 background-color: #1278cd;
473 color: #ffffff; 340 color: #ffffff;
474 padding: 4px 8px; 341 padding: 4px 8px;
475 -}  
476 -  
477 -/*footer.css*/  
478 -.footer {  
479 - width: 100%;  
480 - height: auto;  
481 - background-color: #3c3c3c  
482 -}  
483 -  
484 -.footer a:hover {  
485 - color: #1287cd  
486 -}  
487 -  
488 -.canrd-site-map {  
489 - position: relative;  
490 - width: 1000px;  
491 - height: 320px;  
492 - margin: 0 auto;  
493 - padding-top: 50px;  
494 -}  
495 -  
496 -dl, dd {  
497 - margin: 0  
498 -}  
499 -  
500 -.canrd-site-map dl {  
501 - width: 200px;  
502 - color: #ffffff;  
503 - float: left;  
504 - clear: right;  
505 -}  
506 -  
507 -.canrd-site-map dt {  
508 - font-size: 18px;  
509 -  
510 -}  
511 -  
512 -.canrd-site-map dd {  
513 - margin: 25px auto;  
514 - font-size: 14px;  
515 - color: #C3C5C6;  
516 -}  
517 -  
518 -.canrd-site-map dd a {  
519 - color: #C3C5C6;  
520 -}  
521 -  
522 -.canrd-site-map .follow-us {  
523 - width: 330px;  
524 - margin-left: 50px;  
525 -}  
526 -  
527 -.contact-detail{  
528 - margin-left: 2em;  
529 -}  
530 -  
531 -.follow-us div {  
532 - overflow: hidden;  
533 -}  
534 -  
535 -.follow-us div dd {  
536 - margin-bottom: 0;  
537 -}  
538 -  
539 -.follow-us .time {  
540 - font-size: 12px;  
541 -}  
542 -  
543 -.canrd-site-map .site-addr {  
544 - margin-top:18px;  
545 -}  
546 -  
547 -.canrd-site-map .barcode {  
548 - float: left;  
549 - margin-right: 20px;  
550 -}  
551 -  
552 -.friendly-link {  
553 - width: 100%;  
554 - height: 70px;  
555 - line-height: 70px;  
556 - text-align: center;  
557 - background-color: #313131;  
558 - font-size: 14px;  
559 -}  
560 -  
561 -.friendly-link span {  
562 - color: #646464;  
563 -}  
564 -  
565 -.friendly-link a {  
566 - color: #c3c5c6;  
567 - margin-left: 20px;  
568 } 342 }
569 \ No newline at end of file 343 \ No newline at end of file
target/patent/css/user-side-bar.css deleted 100644 → 0
  View file @6a13fa7
1 -/*user-side-bar.css*/  
2 -  
3 -.case-manage-wrap {  
4 - position: relative;  
5 - width: 100%;  
6 - height: auto;  
7 - background-color: #f9f9f9;  
8 - border-top: 4px solid #1287cd;  
9 - color: #646464;  
10 -}  
11 -  
12 -.case-manage-wrap .content {  
13 - position: relative;  
14 - width: 1000px;  
15 - height: auto;  
16 - margin: 0 auto;  
17 -}  
18 -  
19 -.location-wrap {  
20 - position: relative;  
21 - height: 40px;  
22 - line-height: 40px;  
23 - font-size: 12px;  
24 -}  
25 -  
26 -.row-right {  
27 - display: inline-block;  
28 - width: 5px;  
29 - height: 1em;  
30 - background-image: url(/img/case-manage-icon-colle.png);  
31 - background-repeat: no-repeat;  
32 - background-position: 0 4px;  
33 -}  
34 -  
35 -.location-wrap span {  
36 - cursor: pointer;  
37 -}  
38 -.location-wrap span.current {  
39 - color: #1282cd;  
40 -}  
41 -  
42 -.main-wrap {  
43 - overflow: hidden;  
44 - margin-bottom: 100px;  
45 -}  
46 -  
47 -  
48 -  
49 -.side-nav {  
50 - position: relative;  
51 - width: 170px;  
52 - height: auto;  
53 - background-color: #ffffff;  
54 - float: left;  
55 -}  
56 -  
57 -.user-info {  
58 - width: inherit;  
59 - height: 140px;  
60 -}  
61 -  
62 -.head-ico {  
63 - position: relative;  
64 - width: 60px;  
65 - height: 60px;  
66 - background-image: url(/img/default-head-ico.png);  
67 - margin: 0 auto;  
68 - margin-top: 20px;  
69 - cursor: pointer;  
70 - -o-border-radius: 100%;  
71 - -webkit-border-radius: 100%;  
72 - -ms-border-radius: 100%;  
73 - -moz-border-radius: 100%;  
74 - border-radius: 100%;  
75 - overflow: hidden;  
76 -}  
77 -  
78 -.head-ico:hover{  
79 - -o-box-shadow: 0px 0px 5px 0px;  
80 - -webkit-box-shadow: 0px 0px 5px 0px;  
81 - -ms-box-shadow: 0px 0px 5px 0px;  
82 - -moz-box-shadow: 0px 0px 5px 0px;  
83 - box-shadow: 0px 0px 5px 0px;  
84 -}  
85 -  
86 -.user-phone {  
87 - text-align: center;  
88 -}  
89 -  
90 -.edit-btn {  
91 - position: relative;  
92 - width: 50px;  
93 - height: 20px;  
94 - line-height: 20px;  
95 - text-align: center;  
96 - background-color: #f97c5f;  
97 - color: #fff;  
98 - margin: 0 auto;  
99 - font-size: 14px;  
100 - -webkit-border-radius: 16px;  
101 - -o-border-radius: 16px;  
102 - -moz-border-radius: 16px;  
103 - -ms-border-radius: 16px;  
104 - border-radius: 16px;  
105 - cursor: pointer;  
106 -}  
107 -  
108 -.user-side-bar li {  
109 - height: 50px;  
110 - line-height: 50px;  
111 - text-align: center;  
112 - border-bottom: 1px dotted #a0a0a0;  
113 - font-size: 14px;  
114 - cursor: pointer;  
115 -}  
116 -  
117 -.user-side-bar li:first-child {  
118 - border-top: 1px dotted #a0a0a0;  
119 -}  
120 -  
121 -.user-side-bar li:last-child {  
122 - border-bottom: none;  
123 -}  
124 -  
125 -.user-side-bar .side-nav-selected {  
126 - color: #1287cd;  
127 - border-bottom: 1px dotted #1287cd;  
128 -}  
129 \ No newline at end of file 0 \ No newline at end of file
target/patent/css/zhuanli-index.css
  View file @4aee6f0
@@ -34,55 +34,6 @@ li { @@ -34,55 +34,6 @@ li {
34 list-style: none; 34 list-style: none;
35 } 35 }
36 36
37 -.header {  
38 - width: 100%;  
39 - height: 70px;  
40 - background-color: #ffffff;  
41 -}  
42 -  
43 -.header .header-bar {  
44 - position: relative;  
45 - width: 1000px;  
46 - height: 70px;  
47 - margin: 0 auto;  
48 -}  
49 -  
50 -.header .header-bar .logo {  
51 - display: inline-block;  
52 - width: auto;  
53 - height: auto;  
54 - float: left;  
55 - margin-top: 5.5px;  
56 -}  
57 -  
58 -.header .header-bar .nav {  
59 - display: inline-block;  
60 - height: 70px;  
61 - line-height: 70px;  
62 - margin-left: 150px;  
63 -}  
64 -  
65 -.header .header-bar .nav li {  
66 - display: inline-block;  
67 - float: left;  
68 - margin: 0 26px;  
69 -}  
70 -  
71 -.header .header-bar .nav li a {  
72 - display: inline-block;  
73 - height: 70px;  
74 -}  
75 -  
76 -.header .header-bar .nav li a:hover {  
77 - height: 66px;  
78 - border-bottom: 4px solid #1287cd;  
79 -}  
80 -  
81 -.header .header-bar .nav li.nav-active {  
82 - height: 66px;  
83 - border-bottom: 4px solid #1287cd;  
84 -}  
85 -  
86 .banner{ 37 .banner{
87 width: 100%; 38 width: 100%;
88 } 39 }
@@ -90,98 +41,7 @@ li { @@ -90,98 +41,7 @@ li {
90 width: 100%; 41 width: 100%;
91 } 42 }
92 43
93 -/*footer.css*/  
94 -.footer {  
95 - width: 100%;  
96 - height: auto;  
97 - background-color: #3c3c3c  
98 -}  
99 -  
100 -.footer a:hover {  
101 - color: #1287cd  
102 -}  
103 -  
104 -.canrd-site-map {  
105 - position: relative;  
106 - width: 1000px;  
107 - height: 320px;  
108 - margin: 0 auto;  
109 - padding-top: 50px;  
110 -}  
111 -  
112 -dl, dd {  
113 - margin: 0  
114 -}  
115 -  
116 -.canrd-site-map dl {  
117 - width: 200px;  
118 - color: #ffffff;  
119 - float: left;  
120 - clear: right;  
121 -}  
122 -  
123 -.canrd-site-map dt {  
124 - font-size: 18px;  
125 -  
126 -}  
127 -  
128 -.canrd-site-map dd {  
129 - margin: 25px auto;  
130 - font-size: 14px;  
131 - color: #C3C5C6;  
132 -}  
133 -  
134 -.canrd-site-map dd a {  
135 - color: #C3C5C6;  
136 -}  
137 -  
138 -.canrd-site-map .follow-us {  
139 - width: 330px;  
140 - margin-left: 50px;  
141 -}  
142 -  
143 -.contact-detail{  
144 - margin-left: 2em;  
145 -}  
146 -  
147 -.follow-us div {  
148 - overflow: hidden;  
149 -}  
150 -  
151 -.follow-us div dd {  
152 - margin-bottom: 0;  
153 -}  
154 -  
155 -.follow-us .time {  
156 - font-size: 12px;  
157 -}  
158 -  
159 -.canrd-site-map .site-addr {  
160 - margin-top:18px;  
161 -}  
162 -  
163 -.canrd-site-map .barcode {  
164 - float: left;  
165 - margin-right: 20px;  
166 -}  
167 -  
168 -.friendly-link {  
169 - width: 100%;  
170 - height: 70px;  
171 - line-height: 70px;  
172 - text-align: center;  
173 - background-color: #313131;  
174 - font-size: 14px;  
175 -}  
176 -  
177 -.friendly-link span {  
178 - color: #646464;  
179 -}  
180 44
181 -.friendly-link a {  
182 - color: #c3c5c6;  
183 - margin-left: 20px;  
184 -}  
185 45
186 @charset "utf-8"; 46 @charset "utf-8";
187 .content { 47 .content {
@@ -295,34 +155,34 @@ dl, dd { @@ -295,34 +155,34 @@ dl, dd {
295 155
296 /*科路得优势*/ 156 /*科路得优势*/
297 157
298 -.youshi { 158 +.advantage {
299 position: relative; 159 position: relative;
300 width: 1000px; 160 width: 1000px;
301 height: 560px; 161 height: 560px;
302 margin: 0 auto; 162 margin: 0 auto;
303 } 163 }
304 164
305 -.youshi .item-title { 165 +.advantage .item-title {
306 position: relative; 166 position: relative;
307 top: 75px; 167 top: 75px;
308 } 168 }
309 169
310 -.youshi-list { 170 +.advantage-list {
311 position: relative; 171 position: relative;
312 top: 175px; 172 top: 175px;
313 } 173 }
314 174
315 -.youshi-list li { 175 +.advantage-list li {
316 width: 200px; 176 width: 200px;
317 height: auto; 177 height: auto;
318 float: left; 178 float: left;
319 } 179 }
320 180
321 -.youshi-list li div { 181 +.advantage-list li div {
322 text-align: center; 182 text-align: center;
323 } 183 }
324 184
325 -.youshi-list .icon { 185 +.advantage-list .icon {
326 display: inline-block; 186 display: inline-block;
327 width: 150px; 187 width: 150px;
328 height: 150px; 188 height: 150px;
@@ -350,14 +210,14 @@ dl, dd { @@ -350,14 +210,14 @@ dl, dd {
350 background-position: -847px 0; 210 background-position: -847px 0;
351 } 211 }
352 212
353 -.youshi-list .title { 213 +.advantage-list .title {
354 display: inline-block; 214 display: inline-block;
355 color: #1287cd; 215 color: #1287cd;
356 font-size: 20px; 216 font-size: 20px;
357 margin: 25px auto; 217 margin: 25px auto;
358 } 218 }
359 219
360 -.youshi-list .detail { 220 +.advantage-list .detail {
361 font-size: 12px; 221 font-size: 12px;
362 color: #686767; 222 color: #686767;
363 } 223 }
@@ -425,26 +285,26 @@ dl, dd { @@ -425,26 +285,26 @@ dl, dd {
425 .num3 { 285 .num3 {
426 background-position: 0px -130px; 286 background-position: 0px -130px;
427 } 287 }
428 -  
429 -.zhixun-wrap { 288 +/*咨询*/
  289 +.consult-wrap {
430 width: 100%; 290 width: 100%;
431 height: 600px; 291 height: 600px;
432 background-color: #f8f8f8; 292 background-color: #f8f8f8;
433 } 293 }
434 294
435 -.zhixun { 295 +.consult {
436 position: relative; 296 position: relative;
437 width: 1000px; 297 width: 1000px;
438 height: auto; 298 height: auto;
439 margin: 0 auto; 299 margin: 0 auto;
440 } 300 }
441 301
442 -.zhixun .item-title { 302 +.consult .item-title {
443 position: relative; 303 position: relative;
444 top: 50px; 304 top: 50px;
445 } 305 }
446 306
447 -.zhixun-form { 307 +.consult-form {
448 position: relative; 308 position: relative;
449 width: 100%; 309 width: 100%;
450 height: auto; 310 height: auto;
@@ -485,7 +345,7 @@ dl, dd { @@ -485,7 +345,7 @@ dl, dd {
485 margin: 15px auto; 345 margin: 15px auto;
486 } 346 }
487 347
488 -.zhixun-form input { 348 +.consult-form input {
489 width: 200px; 349 width: 200px;
490 height: 2.5em; 350 height: 2.5em;
491 border: 1px solid #1287cd; 351 border: 1px solid #1287cd;
@@ -500,7 +360,7 @@ dl, dd { @@ -500,7 +360,7 @@ dl, dd {
500 font-size: 14px; 360 font-size: 14px;
501 } 361 }
502 362
503 -.zhixun-form .basic { 363 +.consult-form .basic {
504 width: 456px; 364 width: 456px;
505 } 365 }
506 366
@@ -508,7 +368,7 @@ dl, dd { @@ -508,7 +368,7 @@ dl, dd {
508 margin-top: 35px; 368 margin-top: 35px;
509 } 369 }
510 370
511 -.zhixun-form .search-input { 371 +.consult-form .search-input {
512 width: 225px; 372 width: 225px;
513 } 373 }
514 374
target/patent/index.jsp
  View file @4aee6f0
@@ -12,12 +12,12 @@ @@ -12,12 +12,12 @@
12 <div class="banner"> 12 <div class="banner">
13 <img src="/img/banner.png" alt="" class="banner-img" alt=""> 13 <img src="/img/banner.png" alt="" class="banner-img" alt="">
14 </div> 14 </div>
15 -<div class="zhixun-wrap">  
16 - <div class="zhixun"> 15 +<div class="consult-wrap">
  16 + <div class="consult">
17 <div class="item-title"> 17 <div class="item-title">
18 <img src="/img/refer-title.png"> 18 <img src="/img/refer-title.png">
19 </div> 19 </div>
20 - <form class="zhixun-form"> 20 + <form class="consult-form">
21 <div> 21 <div>
22 <div><label class="search-item">专利基础知识咨询</label></div> 22 <div><label class="search-item">专利基础知识咨询</label></div>
23 <input type="text" name="tel-number" placeholder="请输入手机号码" class="basic" id="basic"> <span 23 <input type="text" name="tel-number" placeholder="请输入手机号码" class="basic" id="basic"> <span
@@ -89,11 +89,11 @@ @@ -89,11 +89,11 @@
89 </div> 89 </div>
90 </div> 90 </div>
91 <div class="youshi-wrap"> 91 <div class="youshi-wrap">
92 - <div class="youshi"> 92 + <div class="advantage">
93 <div class="item-title"> 93 <div class="item-title">
94 <img src="/img/keludeyoushi.png" alt="科路得优势"> 94 <img src="/img/keludeyoushi.png" alt="科路得优势">
95 </div> 95 </div>
96 - <ul class="youshi-list"> 96 + <ul class="advantage-list">
97 <li> 97 <li>
98 <div> 98 <div>
99 <span class="icon kuaijie"></span> 99 <span class="icon kuaijie"></span>
target/patent/order_detail.jsp
  View file @4aee6f0
  1 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 2 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
2 <html lang="en"> 3 <html lang="en">
3 -  
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6 <title>科路得</title> 6 <title>科路得</title>
7 - <style type="text/css">  
8 - *{  
9 - margin:0 auto;  
10 - padding: 0;  
11 - }  
12 - .content{  
13 - min-height: 200px;  
14 - }  
15 - .content .show{  
16 - margin-top:20px;  
17 - width: 32%;  
18 - }  
19 - </style> 7 + <link rel="stylesheet" type="text/css" href="/css/order_detail.css">
20 </head> 8 </head>
21 9
22 <body> 10 <body>
23 <jsp:include page="/include/header.jsp" flush="true"/> 11 <jsp:include page="/include/header.jsp" flush="true"/>
24 -  
25 -<div class="content">  
26 - <div class="show">  
27 - <p>订单ID: ${order.id}</p> 12 +<div class="case-manage-wrap">
  13 + <div class="content">
  14 + <div class="location-wrap">
  15 + <span>个人中心</span>
  16 + <i class="row-right"></i>
  17 + <i class="row-right"></i>
  18 + <span class="current">案件管理</span>
  19 + </div>
  20 + <div class="main-wrap">
  21 + <jsp:include page="/include/user_side.jsp" flush="true"/>
  22 + <div class="case-content">
  23 + <p>订单ID: ${order.id}</p>
  24 + </div>
  25 + </div>
28 </div> 26 </div>
29 </div> 27 </div>
30 -  
31 <jsp:include page="/include/footer.jsp" flush="true"/> 28 <jsp:include page="/include/footer.jsp" flush="true"/>
  29 +<script type="text/javascript" src="js/jquery-1.11.1.min.js"></script>
32 </body> 30 </body>
33 </html> 31 </html>