Browse Source

修改科研资源的相关bug

luyanan 8 years ago
parent
commit
4241854611

+ 3 - 150
src/main/webapp/consult.html

@ -6,7 +6,7 @@
6 6
<div class="workconitem consublock">
7 7
    <div class="workcontit">咨询<a class="worksamlltit worksamlltit3 worksamlltitnow" href="#getConsult">收到咨询</a><a class="worksamlltit worksamlltit3" href="#getReply">收到回复</a><!-- <span class="workset floatR">设置</span> --></div>
8 8
    <div class="worksubcon"> 
9
    	<div class="workmysrc workmysrc3" id="getConsult" style="display:block;">	
9
    	<div class="workmysrc workmysrc3" id="getConsult" style="display:none;">	
10 10
             <div class="workmenubox clearfix">
11 11
                <form class="workmenufrm floatR">
12 12
                    <div class="workselectbox floatL consultSelect" onclick="showSelect('consultSelect','consultOption','tip')">
@ -44,96 +44,7 @@
44 44
             </div>   
45 45
             
46 46
            <div class="workselectcon" id="workContainer">
47
                <!-- <div class="workselectitem">
48
                    <table width="100%">
49
                        <tr>
50
                            
51
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">1</span></td>
52
                            <td style="position:relative;" width="86%">
53
                                <div class="workinfor worksitcon">
54
                                    <h4><a href="" class="named" id="nameS">1111111111111程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
55
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
56
                                    <h6><span>咨询主题:<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型:<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间:<em>2016-10-09 10:00</em></span></h6>
57
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>:</p>
58
                                    <p class="rebackcon">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tem</p>   
59
                                </div>
60
                                <div class="workhandle">
61
                                        <div class="rightopert floatR">
62
	                                        <span class="replybtn" >回复/查看</span>
63
	                                        <span class="moreopert">...</span>
64
	                                        <ul class="moreopertbtn">
65
	                                          	<li>投诉</li>
66
	                                        </ul>
67
                                        </div>
68
                                        <div class="leftstate floatR">
69
                                        	<span class="coultstate"><i>进行中</i><em></em></span>
70
                                        </div>
71
                                </div> 
72
                            </td>
73
                        </tr>
74
                    </table>
75
                </div>
76
                <div class="workselectitem">
77
                    <table width="100%">
78
                        <tr>
79
                            
80
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">46</span></td>
81
                            <td style="position:relative;" width="86%">
82
                                <div class="workinfor worksitcon">
83
                                    <h4><a href="" class="named" id="nameS">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
84
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
85
                                    <h6><span>咨询主题:<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型:<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间:<em>2016-10-09 10:00</em></span></h6>
86
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>:</p>
87
                                    <p class="rebackcon">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tem</p>   
88
                                </div>
89
                                <div class="workhandle">
90
                                		
91
                                        <div class="rightopert floatR">
92
	                                        <span class="replybtn">回复/查看</span>
93
	                                        <span class="moreopert">...</span>
94
	                                        <ul class="moreopertbtn">
95
	                                          	<li>投诉</li>
96
	                                        </ul>
97
                                        </div>
98
                                        <div class="leftstate floatR">
99
                                        	<span class="coultstate"><i>进行中</i><em></em></span>
100
                                        </div>
101
                                </div> 
102
                            </td>
103
                        </tr>
104
                    </table>
105
                </div> 
106
                 <div class="workselectitem">
107
                    <table width="100%">
108
                        <tr>
109
                            
110
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">1</span></td>
111
                            <td style="position:relative;" width="86%">
112
                                <div class="workinfor worksitcon">
113
                                    <h4><a href="" class="named" id="nameS">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
114
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
115
                                    <h6><span>咨询主题:<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型:<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间:<em>2016-10-09 10:00</em></span></h6>
116
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>:</p>
117
                                    <p class="rebackcon">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tem</p>   
118
                                </div>
119
                                <div class="workhandle">
120
                                		<div class="rightopert floatR">
121
	                                        <span class="replybtn">回复/查看</span>
122
	                                        <span class="moreopert">...</span>
123
	                                        <ul class="moreopertbtn">
124
	                                          	<li>投诉</li>
125
	                                        </ul>
126
                                        </div>
127
                                        <div class="leftstate floatR">
128
                                        	<span class="coultstate"><i>咨询完成待评价</i><em></em></span>
129
                                        </div>
130
                                        
131
                                </div> 
132
                            </td>
133
                        </tr>
134
                    </table>
135
                </div>
136
                 -->
47
                
137 48
                <div class="tcdPageCode"><span class="disabled">上一页</span><span class="current">1</span><a href="javascript:;" class="tcdNumber">2</a><a href="javascript:;" class="tcdNumber">3</a><a href="javascript:;" class="tcdNumber">4</a><span>...</span><a href="javascript:;" class="tcdNumber">26</a><a href="javascript:;" class="nextPage">下一页</a></div>
138 49
            </div>
139 50
        </div>
@ -176,65 +87,7 @@
176 87
             </div>   
177 88
             
178 89
            <div class="workselectcon" id="workContainer2">
179
                <!-- <div class="workselectitem">
180
                    <table width="100%">
181
                        <tr>
182
                            
183
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">1</span></td>
184
                            <td style="position:relative;" width="86%">
185
                                <div class="workinfor worksitcon">
186
                                    <h4><a href="" class="named" id="nameS">0000000000程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
187
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
188
                                    <h6><span>咨询主题:<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型:<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间:<em>2016-10-09 10:00</em></span></h6>
189
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>:</p>
190
                                    <p class="rebackcon">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tem</p>   
191
                                </div>
192
                                <div class="workhandle">
193
                                        <div class="rightopert floatR">
194
	                                        <span class="replybtn">回复/查看</span>
195
	                                        <span class="moreopert">...</span>
196
	                                        <ul class="moreopertbtn">
197
	                                          	<li>投诉</li>
198
	                                        </ul>
199
                                        </div>
200
                                        <div class="leftstate floatR">
201
                                        	<span class="coultstate"><i>咨询完成待评价</i><em></em></span>
202
                                        </div>
203
                                </div> 
204
                            </td>
205
                        </tr>
206
                    </table>
207
                </div>
208
                <div class="workselectitem">
209
                    <table width="100%">
210
                        <tr>
211
                            
212
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">1</span></td>
213
                            <td style="position:relative;" width="86%">
214
                                <div class="workinfor worksitcon">
215
                                    <h4><a href="" class="named" id="nameS">0000000000000程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
216
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
217
                                    <h6><span>咨询主题:<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型:<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间:<em>2016-10-09 10:00</em></span></h6>
218
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>:</p>
219
                                    <p class="rebackcon">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viveorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tem</p>   
220
                                </div>
221
                                <div class="workhandle">
222
                                        <div class="rightopert floatR">
223
	                                        <span class="replybtn">回复/查看</span>
224
	                                        <span class="moreopert">...</span>
225
	                                        <ul class="moreopertbtn">
226
	                                          	<li>投诉</li>
227
	                                        </ul>
228
                                        </div>
229
                                        <div class="leftstate floatR">
230
                                        	<span class="coultstate"><i>咨询完成待评价</i><em></em></span>
231
                                        </div>
232
                                </div> 
233
                            </td>
234
                        </tr>
235
                    </table>
236
                </div> 
237
                 -->
90
                
238 91
                <div class="tcdPageCode"><a href="javascript:;" class="disabled">上一页</a><span class="current">1</span><a href="javascript:;" class="tcdNumber">2</a><a href="javascript:;" class="tcdNumber">3</a><a href="javascript:;" class="tcdNumber">4</a><span>...</span><a href="javascript:;" class="tcdNumber">26</a><a href="javascript:;" class="nextPage">下一页</a></div>
239 92
            </div>
240 93
        </div>

+ 4 - 18
src/main/webapp/css/popup.css

@ -24,7 +24,7 @@
24 24
.resoubox .btntab{ margin-top:20px;}
25 25
.resoutab{ min-width:400px;}
26 26
.resoutab tr td{ min-width:260px; padding:4px; line-height:30px; }
27
.resoutab tr th{ line-height:30px;}
27
.resoutab tr th{ line-height:30px;vertical-align: text-top; padding:4px 0;}
28 28
.requiredcon{ color:red; position:absolute;font-size:16px; top:0; right:0;}
29 29

30 30
.resouimgbox{ width:240px; margin:10px;}
@ -34,20 +34,6 @@
34 34
.resouimgmsg{ position: relative; top:10px;left:30px;font-size: 13px;color: #aaa;}
35 35
/*资源图片上传*/
36 36
.resouimgshow{width:100%; height:100%;}
37
.wrap{ height:200px;position:relative; }
38
.jy-up-ch{ position: relative; left:20px; bottom:0; width: 200px;}
39
.jy-up-ch .bch{ display: block; position: absolute; background-repeat: no-repeat; background-image: url(../images/bch.jpg); }
40
.jy-up-ch .bch1{ width: 15px; height: 20px; background-position: 0 0; left: 0; top: 10px; }
41
.jy-up-ch .bch2{ width: 39px; height: 24px; background-position: -15px 0px; left: 50%; margin-left: -39px; top: 7px; }
42
.jy-up-ch .bch3{ width: 37px; height: 24px; background-position: -54px 0px; left: 50%; top: 7px; }
43
.jy-up-ch .bch4{ width: 15px; height: 20px; background-position: -91px 0px; right: 0; top: 10px; }
44
.jy-up-ch .bch1:hover{ background-position: 0 -27px; }
45
.jy-up-ch .bch2:hover{ background-position: -15px -24px;}
46
.jy-up-ch .bch3:hover{ background-position: -54px -24px;}
47
.jy-up-ch .bch4:hover{ background-position: -91px -27px;}
48
.jc-demo-box{position: relative; background-color: #f8f8f8; width: 100%; height: 100%; overflow: hidden; }
49
.jcrop_w{ overflow: hidden; }
50
.jcrop_w img{ position: absolute; }
51 37

52 38
/*合作项目及评价*/
53 39
.teamworkbox{ margin-top:20px;}
@ -89,7 +75,7 @@
89 75
.commentbox{ padding:20px; }
90 76
.commentbox table{width:640px;}
91 77
.commentcon tr td{ width:90%;max-width:400px; padding:4px 0;}
92
.commentcon tr th{ width:10%;}
78
.commentcon tr th{ width:10%; vertical-align: text-top; padding:4px 0;}
93 79
.noconmment{ line-height:120px;}
94 80

95 81
.evastarbox2{ overflow:hidden;}
@ -129,8 +115,8 @@
129 115
.resoudetailinfo{position:absolute;margin-top:40px; background:#fff; font-size:14px;border-radius:10px;padding:20px;margin-bottom:40px;z-index:1900;box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555;}
130 116
.resoudetailinfo .resoushowimg1{width:100%; border:1px solid #d6d6d6; height:200px;overflow:hidden;}
131 117
.resoudetailinfo .resoutab1{ width:400px;}
132
.resoudetailinfo .resoutab1 tr td{ min-width:200px; padding:4px;line-height:30px; }
133
.resoudetailinfo .resoutab1 tr th{ line-height:30px;}
118
.resoudetailinfo .resoutab1 tr td{ min-width:200px; padding:4px;line-height:30px;  }
119
.resoudetailinfo .resoutab1 tr th{ line-height:30px;vertical-align: text-top; padding:4px 0;}
134 120

135 121
.paymentbox1{ padding:20px;}
136 122
.payaddbox1{  width:580px; margin:auto; margin-top:20px;padding:10px; background:#f8f8f8;}

+ 15 - 6
src/main/webapp/css/workspace.css

@ -51,7 +51,7 @@
51 51
.worktab .worktabtit{ height:40px;background:#fff9ef;border-bottom:1px #D8D8D8 solid;}
52 52
.worktab .workitem{ border-bottom:1px #D8D8D8 solid;height:110px; padding:10px 0;}
53 53
.worktab .workitem:nth-child(odd){background:#fff;}
54
.workitemsrc{ cursor:pointer; color:#702C40;}
54
.workitemsrc{/* cursor:pointer;*/ color:#702C40;}
55 55
.operatebtn,.opbtn{ display:block;margin-top:10px;}
56 56
.operatebtn span,.opbtn span{ color:#ff8400; cursor:pointer; }
57 57
.modification{padding:10px 0;}
@ -94,10 +94,10 @@
94 94
.writespan{ margin-top:10px; font-weight:bold;}
95 95

96 96
/*资源、项目*/
97
.sharesrcbox11{ overflow:hidden; width:100%; padding:10px; height:240px;}
98
.sharesrcbox11 .sharesrc{ width:28%; margin:10px 20px; float:left;}
97
.sharesrcbox11{ overflow:hidden; width:100%; padding:10px; height:320px;}
98
.sharesrcbox11 .sharesrc{ width:200px; margin:10px 20px; float:left;}
99 99
.sharesrcbox11 .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
100
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;border-radius: 4px;}
100
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;border-radius: 4px;margin: 8px;}
101 101
.sharesrcbox11 .shareopeart{ position:absolute;background:rgba(0,0,0,.4); line-height:30px; text-align:center; bottom:-30px; left:0px; z-index:100; overflow:hidden; width:100%; cursor:pointer;}
102 102

103 103
.objectsrcbox{ overflow:hidden; width:100%; padding:10px; height:160px;}
@ -171,9 +171,18 @@
171 171

172 172
.dialogcontain{ background:#fff; text-align:center; border-bottom:1px #d6d6d6 solid; position:relative;}
173 173
.dialogcontain .dialoginfo{ max-width:460px; padding:10px;  margin:auto;}
174
.dialogcontain .dialoginfo div{ padding: 4px 10px;}
174
.dialogcontain .dialoginfo .dialoginfotype{ padding: 2px 10px;}
175 175
.dialogcontain .dialoginfo .dialogtit{ font-weight:600;}
176
.dialogcontain .dialoginfo .dialogsurebtn { width: 200px; margin: 10px auto;padding:6px 20px; border-radius:6px; background:#ff8400;color:#fff; cursor:pointer; }
176
.dialogcontain .dialoginfo .thanksblock{width:400px; margin:auto;}
177
.dialogcontain .dialoginfo .thankbox{ margin:2px 6px;}
178
.dialogcontain .dialoginfo .evadbox{ overflow:hidden; width:200px;}
179
.dialogcontain .dialoginfo .evamargin{ margin:auto;}
180

181
.dialogcontain .dialoginfo .evadtit{ margin:2px 6px;}
182
.dialogcontain .dialoginfo .thankbox{ width:190px;}
183
.dialogcontain .dialoginfo .thankbox span{ padding:0 12px; font-weight:600;}
184
.dialogcontain .dialoginfo .dialogsurebtn{margin: 10px auto;}
185
.dialogcontain .dialoginfo .dialogsurebtn span {padding:6px 20px; border-radius:6px; background:#ff8400;color:#fff; cursor:pointer; }
177 186

178 187
.dialogcontain .dialogstatus{ position:absolute; top:-20px; right: -8px;background: #ff8400; color: #fff; padding: 0 60px;border-radius: 20px 0 0 20px;z-index: 2; line-height: 40px; }
179 188
.dialogcontain .dialogstatus em{position: absolute;width: 0px; height: 0px;border-top: 0px solid  rgb(180, 60, 6);border-bottom: 6px solid transparent;border-left: 8px solid  rgb(180, 60, 6); border-right: 0px solid transparent;right: 0px; bottom: -5px;}

+ 40 - 132
src/main/webapp/diloags.html

@ -8,9 +8,9 @@
8 8
        </div>
9 9
        <div class="dialogcontain">
10 10
        	<div class="dialoginfo">
11
                <div><span class="dialogtit" id="dialog_consultTitle">咨询主题:</span><span id="dial_consultTitle"></span></div>
12
                <div><span class="dialogtit" id="dialog_consultType">咨询类型:</span><span id="dial_consultType"></span></div>
13
                <div class="dialogbtnbox">
11
                <div class="dialoginfotype"><span class="dialogtit" id="dialog_consultTitle">咨询主题:</span><span id="dial_consultTitle"></span></div>
12
                <div class="dialoginfotype"><span class="dialogtit" id="dialog_consultType">咨询类型:</span><span id="dial_consultType"></span></div>
13
                <div class="dialoginfotype dialogbtnbox">
14 14
	                <div class="dialogsurebtn displayNone" id="dial_confirmFinishConsult">
15 15
	                	<span>点击确认完成咨询</span>
16 16
	                </div>
@ -21,18 +21,37 @@
21 21
	                	<span>表示感谢</span>
22 22
	                </div>
23 23
                </div>
24
                <div id="showAllAssess" class="clearfix">
25
                	<div class="evadtit floatL">总体评价</div>
26
                	<div class="evadegree floatL">
27
               			<div class="evastarbox2">
28
               				<span class="evastar2"></span>
29
               				<span class="evastar2"></span>
30
               				<span class="evastar2"></span>
31
               				<span class="evastar2"></span>
32
               				<span class="evastar2"></span>
33
               			</div>
34
                	</div>	
35
                	<div class="thankbox floatL dispalyNone" id="dialog_thanks">感谢金额<span id="dialog_thanksMoney"></span>元</div>
24
                <div class="dialoginfotype">
25
                	<div id="showAllAssess" class="thanksblock clearfix">
26
	                	<div class="evadbox floatL">
27
		                	<div class="evadtit floatL">总体评价</div>
28
		                	<div class="evadegree floatL">
29
		               			<div class="evastarbox2">
30
		               				<span class="evastar2"></span>
31
		               				<span class="evastar2"></span>
32
		               				<span class="evastar2"></span>
33
		               				<span class="evastar2"></span>
34
		               				<span class="evastar2"></span>
35
		               			</div>
36
		                	</div>
37
	                	</div>	
38
	                	<div class="thankbox floatR" id="dialog_thanks">感谢金额<span id="dialog_thanksMoney"></span>元</div>
39
	                </div>
40
	                <div id="showAllAssess" class="thanksblock clearfix">
41
	                	<div class="evadbox evamargin">
42
		                	<div class="evadtit floatL">总体评价</div>
43
		                	<div class="evadegree floatL">
44
		               			<div class="evastarbox2">
45
		               				<span class="evastar2"></span>
46
		               				<span class="evastar2"></span>
47
		               				<span class="evastar2"></span>
48
		               				<span class="evastar2"></span>
49
		               				<span class="evastar2"></span>
50
		               			</div>
51
		                	</div>
52
	                	</div>	
53
	                	<div class="thankbox  evamargin dispalyNone" id="dialog_thanks">感谢金额<span id="dialog_thanksMoney"></span>元</div>
54
	                </div>
36 55
                </div>
37 56
                
38 57
                
@ -42,101 +61,14 @@
42 61
        
43 62
        <div class="dialogbody clearfix" id="dialogContent">
44 63
        	<!-- 左边用户 -->
45
        	<!-- <div class="dialogleftitem">
46
            	<div class="dilmod">
47
                	<div class="diluser floatL">
48
                    	<a href="" target="_blank" class="userface">
49
                        	<img src="images/default-photo.jpg" width="100%" height="100%">
50
                        </a>
51
                    </div>
52
                    <div class="dilinfobox dilinfobox_l floatL">
53
                    	<div class="dilarrow dilarrow_l"></div>
54
                        <div class="dilarrow dilarrow_l_bor"></div>
55
                    	<div class="delinfocon clearfix">
56
                            <div class="delinfomain floatL">
57
                            	<div class="cont">
58
                            		<p></p>
59
                                </div>
60
                            </div>
61
                        </div>
62
                    	
63
                    </div>
64
                </div>
65
            </div>
66
            左边用户//
64
        	
65
          	<!--  左边用户// -->
67 66
            
68
            右边用户
69
            <div class="dialogrightitem">
70
            	<div class="dilmod">
71
                	<div class="diluser floatR">
72
                    	<a href="" target="_blank" class="userface">
73
                        	<img src="images/default-photo.jpg" width="100%" height="100%">
74
                        </a>
75
                    </div>
76
                    <div class="dilinfobox dilinfobox_r floatR">
77
                    	<div class="delinfocon clearfix">
78
                        	<div class="dilarrow dilarrow_r"></div>
79
                            <div class="dilarrow dilarrow_r_bor"></div>
80
                            <div class="delinfomain floatR">
81
                            	<div class="cont">
82
                            		<p></p>
83
                                </div>
84
                            </div>
85
                        </div>
86
                    	
87
                    </div>
88
                </div>
89
            </div>
90
            右边用户//
67
            <!--  右边用户 -->
68
            
69
            <!-- 右边用户// -->
91 70
                
92
            右边用户
93
          <div class="dialogrightitem">
94
            	<div class="dilmod">
95
                	<div class="diluser floatR">
96
                    	<a href="" target="_blank" class="userface">
97
                        	<img src="images/default-photo.jpg" width="100%" height="100%">
98
                        </a>
99
                    </div>
100
                    <div class="dilinfobox dilinfobox_r floatR">
101
                    	<div class="delinfocon clearfix">
102
                        	<div class="dilarrow dilarrow_r"></div>
103
                        	<div class="dilarrow dilarrow_r_bor"></div>
104
                            <div class="delinfomain floatR">
105
                            	<div class="cont">
106
                            		<p></p>
107
                                </div>
108
                            </div>
109
                        </div>
110
                    	
111
                    </div>
112
                </div>
113
            </div>
114
            右边用户//   
115
				
116
            左边用户
117
        	<div class="dialogleftitem">
118
            	<div class="dilmod">
119
                	<div class="diluser floatL">
120
                    	<a href="" target="_blank" class="userface">
121
                        	<img src="images/default-photo.jpg" width="100%" height="100%">
122
                        </a>
123
                    </div>
124
                    <div class="dilinfobox dilinfobox_l floatL">
125
                    	<div class="delinfocon clearfix">
126
                        	<div class="dilarrow dilarrow_l"></div>
127
                        	<div class="dilarrow dilarrow_l_bor"></div>
128
                            <div class="delinfomain floatL">
129
                            	<div class="cont">
130
                            		<p></p>
131
                                </div>
132
                            </div>
133
                        </div>
134
                    	
135
                    </div>
136
                </div>
137
            </div> -->
138
          <!--   左边用户//
139
             历史记录 -->
71
            
140 72
            <fieldset class="dialoghistory">
141 73
                <legend class="dialogword">以上为历史记录</legend> 
142 74
            </fieldset>  
@ -165,27 +97,3 @@
165 97
</div>
166 98

167 99
<script type="text/javascript"src="js/dialogs.js"></script>
168

169

170
<script>
171
//对话页面,返回按钮
172
/*  $(".dialoghead").on("click",".backupbtn",function(){
173
	$.ajax({
174
		"url":"consult.html",
175
		"dataType":"html",
176
		"success":function(result){
177
			//console.log(data);
178
							
179
		$(".workcon").html(result);
180
		}
181
	
182
	}) */
183
	
184
/* })  */
185

186
/* $(".dialogcontain .dialoginfo .dialogsurebtn").click(function(){
187
	$(".blackblock").show();
188
		
189
}) */
190

191
</script>

+ 9 - 15
src/main/webapp/js/popup.js

@ -35,16 +35,6 @@ function ResourceInfo() {
35 35
		PopHtml += '<span class="resouup"><input type="file" name="file" id="resouup" >上传资源图片</span>';
36 36
		PopHtml += '<div class="resouimgshow"><img width="100%" height="100%" src="" class="resouImage" /></div></div>';
37 37
		PopHtml += '<span class="resouimgmsg">尺寸240*240,大小在5M以内,<br/>JPG、PNG格式</span>';
38
//		PopHtml += '<div class="wrap" id="jcropdiv">';
39
//		PopHtml += '<div class="jc-demo-box" data="0"><div id="target" class="jcrop_w" ></div></div>';
40
//		PopHtml += '<div class="jy-up-ch">';
41
        //图像操作                                                        
42
//		PopHtml += '<a id="idLeft" href="" class="bch bch1"></a>';
43
//        PopHtml += '<a id="idSmall" href="" class="bch bch2"></a>';
44
//        PopHtml += ' <a id="idBig" href="" class="bch bch3"></a>';
45
//        PopHtml += '<a id="idRight" href="" class="bch bch4"></a>';
46
       // PopHtml += '</div></div>';
47
// 		PopHtml += '<input id="x" type="hidden"/><input id="y" type="hidden"/><input id="w" type="hidden"/><input id="h" type="hidden"/>';
48 38
		PopHtml += '</div></div>';
49 39
		/////////////资源图片上传 结束////////////////////
50 40
		
@ -237,7 +227,7 @@ function ResourceApply(){
237 227
		PopHtml += '<div class="filebtnbox floatR"><a class="filebtn filedownbtn">下载</a><a class="filebtn">删除</a></div> ';
238 228
		PopHtml += '</div></div> ';
239 229
		//发送报价按钮
240
		PopHtml += '<div class="btntab btnboxdown"><div class="addrebtn" style="text-align:center;"><input type="button" value="发送" id="del" class="frmtype frmbtn frm"><input type="button" value="返回" class="frmtype frmbtn frmrbtn "id="cooperation"></div></div>';
230
		PopHtml += '<div class="btntab btnboxdown"><div class="addrebtn" style="text-align:center;"><input type="button" value="发送" id="del" class="frmtype frmbtn frm"><input type="button" value="返回" class="frmtype frmbtn frmrbtn "id="reject"></div></div>';
241 231
		
242 232
		PopHtml += '</div></div>';
243 233
		PopHtml += '</form><span class="workclose"></span></div>';
@ -505,7 +495,7 @@ function DetailInfo(){
505 495
		//PopHtml += '<th><div class="resouinforcon">付款方</div></th>';
506 496
		//PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype" id="profeessorId"></div></td>';
507 497
		PopHtml += '<th><div class="resouinforcon">支付方式</div></th>';
508
		PopHtml += '<td><div class="resouinforcon"><select class="frmtype" id="isOnline"><option value="1" selected>线上支付</option><option value="0">线下支付</option></select></div></td>';
498
		PopHtml += '<td><div class="resouinforcon"><select class="frmtype" id="isOnline"><option value="0">线上支付</option><option value="1">线下支付</option></select></div></td>';
509 499
		PopHtml += '<th><div class="resouinforcon">金额</div></th>';
510 500
		PopHtml += '<td><div class="resouinforcon"><input type="number" class="frmtype" id="payMoney"></div></td>';
511 501
		//PopHtml += '<th><div class="resouinforcon">状态</div></th>';
@ -696,7 +686,7 @@ function ConsultComment() {
696 686
		PopHtml += '<div class="concombox"><form class="resoufrm">';
697 687

698 688
		/*输入评价tab*/
699
		PopHtml += '<div class="addcomment2 displayNone">';
689
		PopHtml += '<div class="addcomment2">';
700 690
		PopHtml += '<div class="resoutit">请对咨询专家进行评价</div><input type="text" id="startCount" style="display:none;" />';
701 691
		PopHtml += '<div class="commentbox2"><table class="commentcon2">';
702 692
		//星级评价
@ -706,11 +696,15 @@ function ConsultComment() {
706 696
		PopHtml += '<tr> <th class="resouinfotype" scope="row"></th><td><div class="resouinforcon"><div class="wordlimit">字数限制为5~200个</div></div></td> </tr>';
707 697
		PopHtml += '</table>';
708 698
		//按钮
709
		PopHtml += '<table class="btntab"><tr><td><div class="addrebtn" style="text-align:center;"><input type="button" value="发表评论" id="sendAssessBtn" class="frmtype frmbtn"></div> </td> </tr></table>';
699
		PopHtml += '<table class="btntab"><tr><td>';
700
		PopHtml += '<div class="addrebtn" style="text-align:center;">';
701
		PopHtml +='<input type="button" value="发表评论" id="sendAssessBtn" class="frmtype frmbtn">';
702
		PopHtml +='<input type="button" value="稍后评价" class="frmtype frmbtn frmrbtn" id="noAssessBtn">';
703
		PopHtml +='</div> </td> </tr></table>';
710 704
		PopHtml += ' </div> </div>';
711 705
		
712 706
	   /////******感谢专家tab*/
713
		PopHtml += '<div class="overcomment displayNone" > ';
707
		PopHtml += '<div class="overcomment" > ';
714 708
		PopHtml += '<div class="resoutit">本次咨询已经结束</div> ';
715 709
		PopHtml += '<div class="commentbox2">  ';
716 710
		//按钮

+ 39 - 29
src/main/webapp/js/sciresource.js

@ -205,7 +205,7 @@ $(function(){
205 205
							add+='<div class="righttab fr"><table width="100%" class="worktab tablecon">'
206 206
							add+='<tr class="worktabtit"><th width="20%" height="40">申请时间</th><th width="20%">需求方</th>'    
207 207
							add+='<th width="12%">联系人</th><th width="14%">交付时间</th>'        
208
							add+='<th width="20%">付款进程</th><th width="14%">状态/操作</th></tr></table><div class="tcdPageCode tcdPageCod'+i+'"></div></div>';
208
							add+='<th width="20%">付款进程</th><th width="12%">状态/操作</th></tr></table><div class="tcdPageCode tcdPageCod'+i+'"></div></div>';
209 209
							$("#consd").append(add);
210 210
							if(data.data[i].subject==undefined){
211 211
								$(".li1").eq(i).css({"display":"none"});
@ -268,7 +268,7 @@ $(function(){
268 268
														var addString='<tr class="workitem">'
269 269
										                    addString+='<td>'+data.data.data[j].createTime+'</td>'
270 270
										                     addString+='<td class="workitemsrc">'+data.data.data[j].applysquare+'</td>'
271
										                      addString+='<td> <a class="worktel" href="">'+data.data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'						                  
271
										                      addString+='<td> <span class="worktel">'+data.data.data[j].professor.name+'<!--<span class="worktelbtn"></span>--></span></td>'						                  
272 272
										                      addString+='<td>'+data.data.data[j].deliverTime+'</td>'
273 273
										                       //addString+='<td class="price1'+e+'">'+data.data.data[j].dealPrice+'</td>'
274 274
										                        //addString+='<td>'+data.data.data[j].payMethod+'</td>'
@ -289,7 +289,7 @@ $(function(){
289 289
																		$(".modification"+e+"").eq(j).html(string);
290 290
																	  break;
291 291
																	case 2:
292
																		var string='<span>发送报价待对方确认</span><br/>'
292
																		var string='<span>发送报价待对方确认</span><br/>'
293 293
																		string+='<a class="operatebtn">'
294 294
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus="2" operationId='+data.data.data[j].operationId+'>修改报价</span><br />'
295 295
																		string+='</a>'
@ -305,7 +305,7 @@ $(function(){
305 305
																			$(".modification"+e+"").eq(j).html(string);
306 306
																	  break;
307 307
																	case 4:
308
																		var string='<span>对方拒绝报价合作结束</span><br/>'
308
																		var string='<span>对方拒绝报价合作结束</span><br/>'
309 309
																		string+='<a class="operatebtn">'
310 310
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>查看详情</span><br />'
311 311
																		string+='</a>'
@ -398,6 +398,7 @@ $("#consd").on("click",".detailmess",function(){
398 398
			$(".btnboxdown").css({"display":"block"});
399 399
			$(".applysure").css({"display":"block"});
400 400
			$(".bag").css("display","none");
401
			$("#reject").hide();
401 402
			
402 403
			$(".frm").click(function(){
403 404
				var $date = {};	
@ -575,7 +576,7 @@ function getPageData(pageSize,pageNo,isbind){
575 576
			{	
576 577
			$(".worktabb").html("");
577 578
			var stringTitle="";
578
			stringTitle +='<tr class="worktabtit"><th width="20%" height="40">申请时间</th><th width="20%">需求资源</th><th width="12%">发布者</th><th width="14%">交付时间</th><th width="20%">付款进程</th><th width="14%">状态/操作</th></tr>';
579
			stringTitle +='<tr class="worktabtit"><th width="20%" height="40">申请时间</th><th width="22%">需求资源</th><th width="12%">发布者</th><th width="14%">交付时间</th><th width="22%">付款进程</th><th width="10%">状态/操作</th></tr>';
579 580
			$(".worktabb").append( stringTitle);
580 581
			
581 582
			//console.log(data);
@ -598,7 +599,7 @@ function getPageData(pageSize,pageNo,isbind){
598 599
						stringContent +='<tr class="workitem">'
599 600
	                    stringContent +='<td>'+data.data.data[i].createTime+'</td>'
600 601
	                    stringContent +='<td class="workitemsrc">'+data.data.data[i].resource.resourceName+'</td>'
601
	                    stringContent +='<td> <a class="worktel" href="">'+data.data.data[i].resource.professor.name+'<span class="worktelbtn"></span></a></td>'	                    
602
	                    stringContent +='<td> <span class="worktel">'+data.data.data[i].resource.professor.name+'<!--<span class="worktelbtn"></span>--></span></td>'	                    
602 603
	                    stringContent +='<td>'+data.data.data[i].deliverTime+'</td>'      
603 604
	                    //stringContent +='<td class="price2">'+data.data.data[i].dealPrice+'</td>'     
604 605
	                    //stringContent +='<td>'+data.data.data[i].payMethod+'</td>'       
@ -641,7 +642,7 @@ function getPageData(pageSize,pageNo,isbind){
641 642
								$(".loginStatus").eq(i).html(string);
642 643
							  break;
643 644
							case 5:
644
								var string='<span>对方拒绝合作合作结束</span><br/>'
645
								var string='<span>对方拒绝合作合作结束</span><br/>'
645 646
								string+='<a class="opbtn">'
646 647
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>查看详情</span><br />'
647 648
								string+='</a>'
@ -720,8 +721,8 @@ $(".workmysrc").on("click",".drawback",function(){
720 721
	 $("#totalPrice").text($price);	
721 722
	 discussGetPaidMoney(opo,$price);
722 723
		 $(".panbtn").click(function(){	
723
			 var payed=$("#realCharge").text();//已经收到的付款
724
			 var paying= $("#payMoney").val();//此次正在付入金额
724
			 var payed= Number($("#realCharge").text());//已经收到的付款
725
			 var paying= Number($("#payMoney").val());//此次正在付入金额
725 726
			 //alert(payed+","+paying);
726 727
			 
727 728
			if(paying <= payed)
@ -742,6 +743,7 @@ function getPay(){
742 743
		{
743 744
			if (rdata.success) 
744 745
			{
746
			
745 747
			$(".blackcover").remove();
746 748
			$("body").css("position","static");			
747 749
				getPageData(6,1,false);																	
@ -794,8 +796,8 @@ $(".workmysrc").on("click",".payMonety",function(){
794 796
	 $("#totalPrice").text($price);	
795 797
	 discussGetPaidMoney(opo,$price);
796 798
		 $("#panaddbtn").click(function(){				
797
			 var aa= $("#payMoney").val();	
798
			var bb=$("#balance").text();			
799
			 var aa= Number($("#payMoney").val());	
800
			var bb=Number($("#balance").text());			
799 801
			 if(aa<bb){	
800 802
				 
801 803
					$.MsgBox.Confirm("消息", "确定支付吗?",getPay);
@ -862,10 +864,23 @@ function discussGetPaidMoney(operationId,priceDifference){
862 864
	"data":{"operationId":operationId},		
863 865
	"success":function(data){
864 866
		if(data.success){
867
			//console.log(data);
865 868
			var popHtml="";
866 869
			var $data=data.data;
867 870
			var m;
868 871
			for(var i=0;i<$data.length;i++){
872
				if($data[i].paidMoney==undefined)
873
				{
874
					$data[i].paidMoney=0;
875
				}
876
				if($data[i].returnMoney==undefined)
877
				{
878
					$data[i].returnMoney=0;
879
				}
880
				if($data[i].remark==undefined)
881
				{
882
					$data[i].remark="--";
883
				}
869 884
				
870 885
				PopHtml = '<tr class="payitem">';
871 886
				PopHtml += '<td><div class="resouinforcon">'+changeTime($data[i].createTime)+'</div></td>';
@ -876,20 +891,15 @@ function discussGetPaidMoney(operationId,priceDifference){
876 891
				PopHtml += '<td><div class="resouinforcon">'+$data[i].remark+'</div></td>';
877 892
				PopHtml += '</tr>';
878 893
				$("#paytit").append(PopHtml);
879
				if($data[i].paidMoney==undefined)
880
				{
881
					$data[i].paidMoney=0;
882
				}
883
				if($data[i].returnMoney==undefined)
884
				{
885
					$data[i].returnMoney=0;
886
				}
894
				
895
				
887 896
				m=$data[i].paidMoney-$data[i].returnMoney;				
888 897
				$(".to").eq(i).text(m);
889
				if($data[i].payType==0){
890
					$(".resou").eq(i).text("线下支付");
891
				}else{
898
				
899
				if($data[i].isonline==0){
892 900
					$(".resou").eq(i).text("线上支付");
901
				}else{
902
					$(".resou").eq(i).text("线下支付");
893 903
				}
894 904
				if($data[i].payStatus==0){
895 905
					$(".resta").eq(i).text("未确认");
@ -1090,7 +1100,7 @@ function getAssess(operationId,le){
1090 1100
			}
1091 1101
			else 
1092 1102
			{
1093
				alert("jjj");
1103
				//alert("jjj");
1094 1104
			}
1095 1105
		},
1096 1106
		"data" :{"operationId":operationId},
@ -1207,15 +1217,15 @@ $(".workmysrc").on("click",".detailm",function(){
1207 1217
		$("#payMethod").replaceWith("<span id='payMethod'><span>");
1208 1218
		$("#dealPrice").replaceWith("<span id='dealPrice'><span>");
1209 1219
		$("#consultContent").replaceWith("<span id='consultContent'><span>");
1210
		$(".frm")[0].value="直接拒绝";
1211
		$("#cooperation")[0].value="合作";		
1212
		$(".frm").click(function(){
1220
		$("#del")[0].value="合作";
1221
		$("#reject")[0].value="直接拒绝";		
1222
		$("#reject").click(function(){
1213 1223
			n=4;
1214 1224
			$(".blackcover").remove();
1215 1225
			$("body").css("position","static");
1216 1226
			$.MsgBox.Confirm("消息", "确定继续吗?",upStatus);
1217 1227
		})
1218
		$("#cooperation").click(function(){
1228
		$("#del").click(function(){
1219 1229
			 n=3;
1220 1230
			 $(".blackcover").remove();
1221 1231
			$("body").css("position","static");
@ -1366,7 +1376,7 @@ function ajaxGet(operationId,o,p){
1366 1376
		"success":function(data){
1367 1377
			if(data.success)
1368 1378
				{
1369
				console.log(data);
1379
				//console.log(data);
1370 1380
					$(".log").text(data.data.resource.resourceName);
1371 1381
					$(".timelog").text(changeTime(data.data.createTime));
1372 1382
					$(".contration").text(data.data.operationId);
@ -1411,7 +1421,7 @@ function ajaxGet1(operationId){
1411 1421

1412 1422
		"success":function(data){
1413 1423
			if(data.success)
1414
				{console.log(data);
1424
				{//console.log(data);
1415 1425
					$(".log").text(data.data.resource.resourceName);
1416 1426
					$(".timelog").text(changeTime(data.data.createTime));
1417 1427
					$(".contration").text(data.data.operationId);

+ 646 - 7
src/main/webapp/js/workindex.js

@ -23,19 +23,658 @@ $(function(){
23 23
		})	
24 24
	}
25 25
	getProfessorData(userid);
26
	getRecentlyData();
26 27
	$("#allResource").on("click",function(){
27 28
		$(".worksubmenu").eq(1).addClass("subcolor").siblings().removeClass("subcolor");
28 29
		$.ajax({
29 30
			"url":"sciresource.html",
30 31
			"dataType":"html",
31
			"success":function(result){
32
				//console.log(data);
33
								
32
			"success":function(result){												
34 33
			$(".workcon").html(result);
35
			}
36
		
34
			}		
35
		})		
36
	})
37
	//获取最近3次的申请
38
	function getRecentlyData(){
39
	$.ajax({		
40
		"url":"/ajax/operation/pqpro",
41
		"type":"get",
42
		"data":{"id":userid},
43
		"async": false,
44
		"success":function(data)
45
		{
46
			if(data.success)
47
				{
48
				$(".sharesrcbox11").html("");
49
					//console.log(data);
50
					for(var i=0;i<data.data.data.length;i++)
51
					{
52
						data.data.data[i].createTime=changeTime(data.data.data[i].createTime);					
53
						var stringContent="";
54
						if(userid==data.data.data[i].professor.id)
55
						{
56
							stringContent +='<div class="sharesrc replySide" resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+' dealPrice='+data.data.data[i].dealPrice+' flag=1>'
57
						}
58
						else
59
						{
60
							stringContent +='<div class="sharesrc replySide" resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+' dealPrice='+data.data.data[i].dealPrice+' flag=0>'
61
						}						
62
	                    stringContent +='<div class="shareshow"><img src="" width="100%" height="100%"class="resourceImage"></div>'
63
	                    stringContent +='<p>资源名称:'+data.data.data[i].resource.resourceName+'</p>'
64
	                    stringContent +='<p>简介:'+data.data.data[i].resource.supportedServices+'</p>'
65
		                stringContent +='<p>最新动态:</p>'
66
		                stringContent +='<p class="statuswork"></p>'
67
		                stringContent +='</div>'
68
		                $(".sharesrcbox11").append(stringContent);
69
	                    $(".resourceImage").eq(i).attr("src","/images/resource/"+data.data.data[i].resource.resourceId+".jpg");
70
						$(".resourceImage").eq(i).load(function(){
71
							
72
						}).error(function(){
73
								$(this).attr("src","/images/default-resource.jpg");
74
							});
75
						//console.log(data.data.data[i].resource.supportedServices);
76
						if(userid==data.data.data[i].professor.id)
77
						{
78
							switch(data.data.data[i].operationStatus)
79
							{
80
								case 1:
81
									var string='<span title="修改申请">申请已发送待'+data.data.data[i].resource.professor.name+'确认</span><br/>'								
82
										$(".statuswork").eq(i).html(string);
83
								  break;
84
								case 2:
85
									var string='<span>'+data.data.data[i].resource.professor.name+'发来报价,回复报价</span><br/>'																								
86
									$(".statuswork").eq(i).html(string);
87
								  break;
88
								case 3:
89
									var string='<span>合作进行中,查看详情</span><br/>'												
90
									$(".statuswork").eq(i).html(string);								
91
								  break;
92
								case 4:
93
									var string='<span>中止合作,查看详情</span><br/>'								
94
									$(".statuswork").eq(i).html(string);
95
								  break;
96
								case 5:
97
									var string='<span>'+data.data.data[i].resource.professor.name+'拒绝合作,合作结束,查看详情</span><br/>'								
98
									$(".statuswork").eq(i).html(string);
99
								  break;
100
								case 6:
101
									var string='<span>本人中止合作,查看详情</span><br/>'								
102
									$(".statuswork").eq(i).html(string);
103
								  break;
104
								case 7:
105
									var string='<span>合作进行中,查看详情</span><br/>'							
106
									$(".statuswork").eq(i).html(string);
107
								  break;
108
								case 8:
109
									var string='<span>完成,查看详情</span><br/>'								
110
									$(".statuswork").eq(i).html(string);
111
								  break;
112
								default:							  
113
							}	
114
						}
115
						else
116
						{
117
							switch(data.data.data[i].operationStatus)
118
							{
119
							case 1:
120
								var string='<span>'+data.data.data[i].professor.name+'</span> <span>发来了</span><span>新的申请</span>'										
121
								$(".statuswork").eq(i).html(string);										
122
								break;
123
								case 2:									  
124
								var string='<span>发送报价待'+data.data.data[i].professor.name+'确认,修改报价</span><br/>';						
125
									$(".statuswork").eq(i).html(string);									
126
									break;									
127
								case 3:										
128
									var string='<span>'+data.data.data[i].professor.name+'发来报价合作进行中,查看详情</span><br/>'								  
129
									$(".statuswork").eq(i).html(string);								
130
									break;									
131
								case 4:										
132
									var string='<span>'+data.data.data[i].professor.name+'拒绝报价,合作结束,查看详情</span><br/>'										
133
									$(".statuswork").eq(i).html(string);								  
134
									break;								
135
								case 5:										
136
									var string='<span>本人拒绝合作,查看详情</span><br/>'									
137
									$(".statuswork").eq(i).html(string);										
138
									break;								  
139
								case 6:									
140
									var string='<span>'+data.data.data[i].professor.name+'中止合作合作结束,查看详情</span><br/>'									
141
									$(".statuswork").eq(i).html(string);									
142
									 break;										
143
								case 7:									  
144
										var string='<span>合作进行中,查看详情</span><br/>'							
145
										$(".statuswork").eq(i).html(string);									
146
										 break;									
147
								case 8:													
148
										var string='<span>完成,查看详情</span><br/>'							 
149
										$(".statuswork").eq(i).html(string);							
150
										break;								
151
								default:
152
							}
153
						}
154
						
155
					}
156
				}
157
				else
158
				{
159
					alert("系统异常!");
160
				}
161
		},
162
		"error":function(){$.MsgBox.Alert('message','fail111')}
163
	});	
164
	}
165
//根据不同的状态进行操作回复或者查看详情
166
	$(".sharesrcbox11").on("click",".replySide",function(){		
167
		var operationId=$(this).attr("operationId");
168
		var operationStatus=$(this).attr("operationStatus");
169
		var priceDifference=$(this).attr("dealPrice");
170
		var flag=$(this).attr("flag");
171
		var resourceId=$(this).attr("resourId");
172
		opo=operationId;		
173
		if(flag==0&&operationStatus==1)
174
		{	ResourceApply();		
175
			ajaxGet(operationId);
176
			$(".dealTime").replaceWith("<span class='dealTime'></span>");
177
			$(".detail").replaceWith("<span class='detail'></span>");
178
			$("select").replaceWith("<span class='sname'></span>")
179
			$(".btnboxdown").css({"display":"none"});
180
			$(".applysure").css({"display":"none"});		
181
			$("#nextStep").click(function(){
182
				$(".stateinfor span").text("报价中");
183
				$(".btnboxup").css({"display":"none"});
184
				$(".btnboxdown").css({"display":"block"});
185
				$(".applysure").css({"display":"block"});
186
				$(".bag").css("display","none");				
187
				$(".frm").click(function(){
188
					var $date = {};	
189
					$date.detailDemand=$(".detail").text();
190
					$date.deliverTime=replaceStr($.trim($(".dealTime").text()));
191
					$date.dealPrice =$("#dealPrice").val();
192
					$date.payMethod = $("#payMethod").val();
193
					$date.replyNotes = $("#consultContent").val();
194
					$date.applysquare = $(".sname").text();
195
					$date.operationId=operationId;
196
					$date.operationStatus=2;
197
					$.ajax({
198
						"url" : "/ajax/operation",
199
						"type" : "put",
200
						"data" :JSON.stringify($date),
201
						"contentType" :"application/json",
202
						"success" : function(data) {
203
							if (data.success) {					
204
								$(".blackcover").remove();
205
								$("body").css("position","static");
206
								getRecentlyData();
207
								$.MsgBox.Alert('message',"报价成功");
208
							} else {
209
								$.MsgBox.Alert('message',data.msg);
210
							}
211
						},
212
					"beforeSend":function(){
213
						//console.log(this.data);
214
					},
215
					});
216
				})
217
			
218
			})
219
			$("#refuses").click(function(){
220
				ResourceApply();
221
				ajaxGet(operationId);
222
				n=5;
223
				$(".blackcover").remove();
224
				$("body").css("position","static");
225
				$.MsgBox.Confirm("消息", "确定拒绝吗?",upStatus1);
226
			});
227
		}
228
		if(flag==0&&operationStatus==2){
229
			ResourceApply();
230
			ajaxGet(operationId);
231
			$(".dealTime").replaceWith("<span class='dealTime'></span>");
232
			$(".detail").replaceWith("<span class='detail'></span>");
233
			$("select").replaceWith("<span class='sname'></span>")
234
			$(".btnboxdown").css({"display":"none"});
235
			$(".applysure").css({"display":"none"});		
236
			$(".stateinfor span").text("修改报价中");
237
			$(".btnboxup").css({"display":"none"});
238
			$(".btnboxdown").css({"display":"block"});
239
			$(".applysure").css({"display":"block"});
240
			$(".bag").css("display","none");			
241
				$(".frm").click(function(){
242
					var $date = {};	
243
					$date.detailDemand=$(".detail").text();
244
					$date.deliverTime=replaceStr($.trim($(".dealTime").text()));
245
					$date.dealPrice = $("#dealPrice").val();
246
					$date.payMethod = $("#payMethod").val();
247
					$date.replyNotes = $("#consultContent").val();
248
					$date.applysquare = $(".sname").text();
249
					$date.operationId=operationId;
250
					$date.operationStatus=2;
251
					$.ajax({
252
						"url" : "/ajax/operation",
253
						"type" : "put",
254
						"data" :JSON.stringify($date),
255
						"contentType" :"application/json",
256
						"success" : function(data) {
257
							if (data.success) {					
258
								$(".blackcover").remove();
259
								$("body").css("position","static");
260
								getRecentlyData();
261
								$.MsgBox.Alert('message',"报价成功");
262
							} else {
263
								$.MsgBox.Alert('message',data.msg);
264
							}
265
						},
266
					"beforeSend":function(){
267
						//console.log(this.data);
268
					},
269
					});
270
				})	
271
		}
272
		if(flag==0&&operationStatus==3){
273
			
274
			DetailInfo();
275
			$("#totalPrice").text(priceDifference);
276
			$(".liuyaninfo").css("display","none");		
277
			$(".pingjiainfo").css("display","none");
278
			$(".filebox").css("display","none");
279
			ajaxGet1(operationId);
280
			$(".payaddbox1").css("display","none");
281
			
282
			discussGetPaidMoney(operationId,priceDifference)
283
		}
284
		if(flag==0&&operationStatus==4){
285
			ResourceApply();
286
			ajaxGet1(operationId);
287
			$(".dealTime").replaceWith("<span class='dealTime'></span>");
288
			$(".detail").replaceWith("<span class='detail'></span>");
289
			$("select").replaceWith("<span class='sname'></span>")
290
			$(".btnboxdown").css({"display":"none"});
291
			$(".applysure").css({"display":"none"});	
292
			$(".stateinfor span").text("详情");
293
			$(".btnboxup").css({"display":"none"});
294
			$(".btnboxdown").css({"display":"block"});
295
			$(".applysure").css({"display":"block"});
296
			$(".bag").css("display","none");
297
			$(".addrebtn").css("display","none");
298
			$("#payMethod").replaceWith("<span id='payMethod'><span>");
299
			$("#dealPrice").replaceWith("<span id='dealPrice'><span>");
300
			$("#consultContent").replaceWith("<span id='consultContent'><span>");
301
				}	
302
		if(flag==0&&operationStatus==5){
303
			ResourceApply();
304
			ajaxGet(operationId);
305
			$(".dealTime").replaceWith("<span class='dealTime'></span>");
306
			$(".detail").replaceWith("<span class='detail'></span>");
307
			$("select").replaceWith("<span class='sname'></span>")
308
			$(".btnboxdown").css({"display":"none"});
309
			$(".applysure").css({"display":"none"});
310
			$(".addrebtn").css("display","none");
311
		}
312
		if(flag==0&&operationStatus==6){
313
			
314
			DetailInfo();	
315
			$("#totalPrice").text(priceDifference);
316
			$(".liuyaninfo").css("display","none");		
317
			$(".pingjiainfo").css("display","none");
318
			$(".filebox").css("display","none");
319
			ajaxGet1(operationId);
320
			$(".payaddbox1").css("display","none");
321
			discussGetPaidMoney(operationId,priceDifference)
322
		}
323
		if(flag==0&&operationStatus==7){
324
			
325
			DetailInfo();
326
			$("#totalPrice").text(priceDifference);
327
			$(".liuyaninfo").css("display","none");		
328
			$(".pingjiainfo").css("display","none");
329
			$(".filebox").css("display","none");
330
			ajaxGet1(operationId);
331
			$(".payaddbox1").css("display","none");
332
			discussGetPaidMoney(operationId,priceDifference)
333
		}
334
		if(flag==0&&operationStatus==8){
335
			
336
			DetailInfo();
337
			$("#totalPrice").text(priceDifference);
338
			$(".liuyaninfo").css("display","none");		
339
			$(".pingjiainfo").css("display","none");
340
			$(".filebox").css("display","none");
341
			ajaxGet1(operationId);
342
			$(".payaddbox1").css("display","none");
343
			discussGetPaidMoney(operationId,priceDifference)
344
		}
345
		if(flag==1&&operationStatus==1)
346
		{ 
347
			ResourceApply();
348

349
			$( "#datepicker" ).datepicker({ "dateFormat":" yy-mm-dd"});
350

351
			$(".stateinfor span").text("修改申请中");
352
			$(".btnboxup").css({"display":"none"});
353
			$(".applysure").css({"display":"none"});
354
			ajaxGet(operationId,1,1);
355
			getIdentity(userid);
356
			//if($(".dealTime").val()!=""&&$(".detail").val()!="")
357
			//{
358
				$("#deliver").on("click",function()
359
						{	
360
							var $data = {};
361
							$data.demandId = userid;
362
							$data.resourceId = resourceId;
363
							$data.operationId=operationId;
364
							$data.detailDemand=$(".detail").val();						
365
							$data.deliverTime=replaceStr($.trim($("#datepicker").val()));
366
							$data.applysquare=$("select option:selected").val();
367
							$data.operationStatus=1;						
368
							$.ajax({
369
								"url" : "/ajax/operation",
370
								"type" : "put",
371
								"success" : function(rdata){
372
									if (rdata.success){
373
										getRecentlyData();
374
										$(".blackcover").remove();
375
										$("body").css("position","static");
376
										$.MsgBox.Alert('消息',"资源申请信息修改成功");									
377
									} else {
378
										$.MsgBox.Alert('消息',"资源申请信息修改失败");
379
									}
380
								},
381
								"data" : JSON.stringify($data) ,
382
								"contentType" :"application/json",							
383
								dataType : "json"
384
							});
385
					});
386
			//}
387
			
388
		}
389
		if(flag==1&&operationStatus==2)
390
		{		
391
			ResourceApply();
392
			ajaxGet1(operationId);
393
			$(".dealTime").replaceWith("<span class='dealTime'></span>");
394
			$(".detail").replaceWith("<span class='detail'></span>");
395
			$("select").replaceWith("<span class='sname'></span>")
396
			$(".btnboxdown").css({"display":"none"});
397
			$(".applysure").css({"display":"none"});			
398
			$(".stateinfor span").text("回复报价中");
399
			$(".btnboxup").css({"display":"none"});
400
			$(".btnboxdown").css({"display":"block"});
401
			$(".applysure").css({"display":"block"});
402
			$(".bag").css("display","none");	
403
			$(".sendpri").text("");
404
			$("#payMethod").replaceWith("<span id='payMethod'><span>");
405
			$("#dealPrice").replaceWith("<span id='dealPrice'><span>");
406
			$("#consultContent").replaceWith("<span id='consultContent'><span>");
407
			$(".frm")[0].value="直接拒绝";
408
			$("#cooperation")[0].value="合作";		
409
			$(".frm").click(function(){
410
				n=4;
411
				$(".blackcover").remove();
412
				$("body").css("position","static");
413
				$.MsgBox.Confirm("消息", "确定继续吗?",upStatus1);
414
			})
415
			$("#cooperation").click(function(){
416
				 n=3;
417
				 $(".blackcover").remove();
418
				$("body").css("position","static");
419
				upStatus1();
420
			})
421
		}
422
		if(flag==1&&operationStatus==3){
423
			DetailInfo();
424
			//console.log(priceDifference);
425
			$("#totalPrice").text(priceDifference);
426
			$(".liuyaninfo").css("display","none");		
427
			$(".pingjiainfo").css("display","none");
428
			$(".filebox").css("display","none");
429
			ajaxGet1(operationId);
430
			$(".payaddbox1").css("display","none");
431
			discussGetPaidMoney(operationId,priceDifference);
432
		}
433
		if(flag==1&&operationStatus==4){
434
			ResourceApply();
435
			ajaxGet1(operationId);
436
			$(".dealTime").replaceWith("<span class='dealTime'></span>");
437
			$(".detail").replaceWith("<span class='detail'></span>");
438
			$("select").replaceWith("<span class='sname'></span>")
439
			$(".btnboxdown").css({"display":"none"});
440
			$(".applysure").css({"display":"none"});
441
			$(".sendpri").text("");		
442
				$(".stateinfor span").text("详情");
443
				$(".resde").text("详情页面");
444
				$(".btnboxup").css({"display":"none"});
445
				$(".btnboxdown").css({"display":"block"});
446
				$(".applysure").css({"display":"block"});
447
				$(".bag").css("display","none");
448
				$(".addrebtn").css("display","none");
449
				$("#payMethod").replaceWith("<span id='payMethod'><span>");
450
				$("#dealPrice").replaceWith("<span id='dealPrice'><span>");
451
				$("#consultContent").replaceWith("<span id='consultContent'><span>");		
452
		}
453
		if(flag==1&&operationStatus==5){
454
			ResourceApply();
455
			ajaxGet(operationId);
456
			$(".stateinfor").find("span").text("合作结束");
457
			$(".dealTime").replaceWith("<span class='dealTime'></span>");
458
			$(".detail").replaceWith("<span class='detail'></span>");
459
			$("select").replaceWith("<span class='sname'></span>")
460
			$(".btnboxdown").css({"display":"none"});
461
			$(".applysure").css({"display":"none"});
462
			//$(".resouinfotype2").text("");
463
			$(".addrebtn").css("display","none");
464
		}
465
		if(flag==1&&operationStatus==6){
466
			DetailInfo();	
467
			$("#totalPrice").text(priceDifference);
468
			$(".filebox").css("display","none");
469
			$(".liuyaninfo").css("display","none");		
470
			$(".pingjiainfo").css("display","none");
471
			$(".filebox").css("display","none");
472
			ajaxGet1(operationId);
473
			$(".payaddbox1").css("display","none");
474
			discussGetPaidMoney(operationId,priceDifference)
475
		}
476
		if(flag==1&&operationStatus==7){
477
			DetailInfo();	
478
			$("#totalPrice").text(priceDifference);
479
			$(".liuyaninfo").css("display","none");		
480
			$(".pingjiainfo").css("display","none");
481
			$(".filebox").css("display","none");
482
			ajaxGet1(operationId);
483
			$(".payaddbox1").css("display","none");
484
			discussGetPaidMoney(operationId,priceDifference)
485
		}
486
		if(flag==1&&operationStatus==8){
487
			DetailInfo();	
488
			$("#totalPrice").text(priceDifference);
489
			$(".liuyaninfo").css("display","none");		
490
			$(".pingjiainfo").css("display","none");
491
			$(".filebox").css("display","none");
492
			ajaxGet1(operationId);
493
			$(".payaddbox1").css("display","none");
494
			discussGetPaidMoney(operationId,priceDifference)
495
		}
37 496
		})
38 497
		
39
	})
40
	
498
		function ajaxGet(operationId,o,p){
499
		$.ajax({	
500
			"url":"/ajax/operation/"+operationId,
501
			"type":"get",
502
			"async": true,
503

504
			"success":function(data){
505
				if(data.success)
506
					{
507
					//console.log(data);
508
						$(".log").text(data.data.resource.resourceName);
509
						$(".timelog").text(changeTime(data.data.createTime));
510
						$(".contration").text(data.data.operationId);
511
						$(".detail").text(data.data.detailDemand);
512
						if(o==1&&p==1){
513
							$(".dealTime").val(changeTime(data.data.deliverTime));
514
						}else{
515
							$(".dealTime").text(changeTime(data.data.deliverTime));
516
						}
517
						
518
						$(".sname").text(data.data.applysquare);
519
						$(".namecon").text(data.data.resource.professor.name);
520
						$(".resouImage").attr("src","/images/resource/"+data.data.resource.resourceId+".jpg");
521
						$(".resouImage").load(function(){})
522
							.error(function(){
523
								$(this).attr("src","/images/default-resource.jpg");
524
							});	
525
						
526
						if(data.data.payMethod){
527
							$("#payMethod").val(data.data.payMethod);
528
						}
529
						if(data.data.dealPrice){
530
							$("#dealPrice").val(data.data.dealPrice);
531
						}
532
						if(data.data.replyNotes){
533
							$("#consultContent").val(data.data.replyNotes);
534
						}
535
					}
536
					else
537
					{
538
						//console.log("系统异常!");
539
					}
540
			},
541
			"error":function(){$.MsgBox.Alert('message','failddd')}
542
		});
543
	}
544
	function upStatus1(){
545
		$.ajax({"url" : "/ajax/operation/operationStatus",
546
			"type" : "POST",
547
			"success" : function(rdata) 
548
			{
549
				if (rdata.success) 
550
				{	
551
					getRecentlyData();
552
				}
553
				else 
554
				{
555
					$.MsgBox.Alert('message','状态更新失败');
556
				}
557
			},
558
			"data" :{"operationId":opo,"operationStatus":n},
559
			"beforeSend":function(){/*console.log(this.data)*/},
560
			"contentType" :"application/x-www-form-urlencoded",
561
			dataType : "json"
562
		});
563
	}
564
	function ajaxGet1(operationId){
565
		$.ajax({	
566
			"url":"/ajax/operation/"+operationId,
567
			"type":"get",
568
			"async": true,
569

570
			"success":function(data){
571
				if(data.success)
572
					{//console.log(data);
573
						$(".log").text(data.data.resource.resourceName);
574
						$(".timelog").text(changeTime(data.data.createTime));
575
						$(".contration").text(data.data.operationId);
576
						$(".detail").text(data.data.detailDemand);
577
						$(".dealTime").text(changeTime(data.data.deliverTime));
578
						$(".namecon").text(data.data.resource.professor.name);
579
						$(".sname").text(data.data.applysquare);
580
						$(".resouImage").attr("src","/images/resource/"+data.data.resource.resourceId+".jpg");
581
						$(".resouImage").load(function(){})
582
							.error(function(){
583
								$(this).attr("src","/images/default-resource.jpg");
584
							});	
585
						if(data.data.payMethod){
586
							$("#payMethod").text(data.data.payMethod);
587
						}
588
						if(data.data.dealPrice){
589
							$("#dealPrice").text(data.data.dealPrice);
590
						}
591
						if(data.data.replyNotes){
592
							$("#consultContent").text(data.data.replyNotes);
593
						}
594
					}
595
					else
596
					{
597
						//console.log("系统异常!");
598
					}
599
			},
600
			"error":function(){$.MsgBox.Alert('message','failddd')}
601
		});
602
	}
603
	function discussGetPaidMoney(operationId,priceDifference){	
604
		var realCharge=0,balance=0;
605
		$.ajax({	
606
		"url":"/ajax/payhistory/qadetail",
607
		"type":"get",
608
		"async": true,
609
		"data":{"operationId":operationId},		
610
		"success":function(data){
611
			if(data.success){
612
				var popHtml="";
613
				var $data=data.data;
614
				var m;
615
				for(var i=0;i<$data.length;i++){
616
					
617
					PopHtml = '<tr class="payitem">';
618
					PopHtml += '<td><div class="resouinforcon">'+changeTime($data[i].createTime)+'</div></td>';
619
					PopHtml += '<td><div class="resouinforcon">'+$data[i].professor.name+'</div></td>';
620
					PopHtml += '<td><div class="resouinforcon resou"></div></td>';
621
					PopHtml += '<td><div class="resouinforcon to"></div></td>';
622
					PopHtml += '<td><div class="resouinforcon resta"></div></td>';
623
					PopHtml += '<td><div class="resouinforcon">'+$data[i].remark+'</div></td>';
624
					PopHtml += '</tr>';
625
					$("#paytit").append(PopHtml);
626
					if($data[i].paidMoney==undefined)
627
					{
628
						$data[i].paidMoney=0;
629
					}
630
					if($data[i].returnMoney==undefined)
631
					{
632
						$data[i].returnMoney=0;
633
					}
634
					m=$data[i].paidMoney-$data[i].returnMoney;				
635
					$(".to").eq(i).text(m);
636
					if($data[i].payType==0){
637
						$(".resou").eq(i).text("线下支付");
638
					}else{
639
						$(".resou").eq(i).text("线上支付");
640
					}
641
					if($data[i].payStatus==0){
642
						$(".resta").eq(i).text("未确认");
643
					}else{
644
						$(".resta").eq(i).text("确认收款");
645
					}
646
					popHtml="";				
647
					realCharge+=m;
648
				}			
649
				balance=priceDifference-realCharge;			
650
				$("#balance").text(balance);
651
				$("#realCharge").text(realCharge);
652
				}
653
				else
654
				{
655
					//console.log("系统异常!");
656
				}
657
		},
658
		"error":function(){$.MsgBox.Alert('message','failddd')}
659
		});
660
	}
661
	function getIdentity(professorId){		
662
		$.ajax({	
663
		"url":"ajax/professor/"+professorId,
664
		"type":"get",
665
		"async": false,
666
		"success":function(data){
667
			if(data.success)
668
			{																				
669
				$("option")[0].value=data.data.name;
670
				$("option")[1].value=data.data.organization.name;			
671
			}
672
			else
673
			{
674
				$.MsgBox.Alert("消息","系统异常!");
675
			}
676
		},
677
		"error":function(){$.MsgBox.Alert('message','failddd')}
678
		})	
679
	}
41 680
});

+ 1 - 26
src/main/webapp/workindex.html

@ -93,32 +93,7 @@
93 93
                <div class="worktit">正在使用的科研资源<a class="worklinkbtn floatR"id="allResource">查看全部</a></div>
94 94
                <div class="wbcon">
95 95
                    <div class="sharesrcbox11">
96
                        <div class="sharesrc">
97
                            <div class="shareshow">
98
                                <a href=""><img src="" width="100%" height="140"></a>
99
                               <!-- <div class="shareopeart">详情</div>-->
100
                            </div>
101
                            <p>资源名称:XXXXX检测仪</p>
102
                            <p>最新动态:</p>
103
                            <p><span>张三</span> <span>发来了</span><span>资源申请</span><span>2016-09-01</span></p>
104
                        </div>
105
                        <div class="sharesrc">
106
                            <div class="shareshow">
107
                                <a href=""><img src="" width="100%" height="140"></a>
108
                            </div>
109
                            <p>资源名称:XXXXX检测仪</p>
110
                            <p>最新动态:</p>
111
                            <p><span>张三</span> <span>发来了</span><span>资源申请</span><span>2016-09-01</span></p>
112
                        </div>
113
                        <div class="sharesrc">
114
                            <div class="shareshow">
115
                                <a href=""><img src="" width="100%" height="140"></a>
116
                            </div>
117
                            <p>资源名称:XXXXX检测仪</p>
118
                            <p>最新动态:</p>
119
                            <p><span>张三</span> <span>发来了</span><span>资源申请</span><span>2016-09-01</span></p>
120
                        </div>
121
    
96
                                                                           
122 97
                    </div>
123 98
                </div>
124 99
            </div>