Browse Source

图片显示点赞,个人修改信息

lipengtao 8 years ago
parent
commit
da2fafa6bb

+ 21 - 22
app/html/proinforbrow-more.html

@ -11,9 +11,8 @@
11 11
12 12
	<body>
13 13
		<header class="mui-bar mui-bar-nav toptitbox">
14
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
15
		    <h1 class="mui-title toptit">专家姓名</h1>
16
		    <a class="mui-icon iconfont icon-share mui-pull-right topmore" id="shareBtn">
14
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>		    
15
		    <!--<a class="mui-icon iconfont icon-share mui-pull-right topmore" id="shareBtn">
17 16
		    	<ul class="sharebox" id="shareBox" style="display:none; color: #000000;">
18 17
		    		<li>
19 18
		    			<span class="mui-icon mui-icon-weixin"></span>
@ -26,16 +25,16 @@
26 25
		    		</li>
27 26
		    		
28 27
		    	</ul>
29
		    </a>
28
		    </a>-->
30 29
		</header>
31 30
		
32 31
		<!-- 主页面内容容器 -->
33 32
    	<div class="mui-content">
34 33
    		<!-- 主界面具体展示内容 -->
35 34
    		<div class="mui-input-group mainbox" id="perfessorEducation">
36
				<div class="maincon">
37
			       <div class="infocontit">教育背景</div> 
38
			       <div class="infocon">
35
				<div class="maincon maincon2">
36
			       <div class="infocon infocon2tit">教育背景</div> 
37
			       <div class="infocon infocon2">
39 38
				       <ul class="mui-table-view listitembox" id="education">
40 39
				           <!--<li class="mui-table-view-cell mui-media listitem">
41 40
				               <a href="javascript:;">
@ -66,9 +65,9 @@
66 65
		       </div>
67 66
		    </div>
68 67
		    <div class="mui-input-group mainbox" id="perfessorsoJob">
69
				<div class="maincon">
70
			       <div class="infocontit">工作经历</div> 
71
			       <div class="infocon">
68
				<div class="maincon maincon2">
69
			       <div class="infocon infocon2tit">工作经历</div> 
70
			       <div class="infocon infocon2">
72 71
				       <ul class="mui-table-view listitembox" id="soJob">
73 72
				           <!--<li class="mui-table-view-cell mui-media listitem">
74 73
				               <a href="javascript:;">
@ -99,9 +98,9 @@
99 98
		       </div>
100 99
		    </div>
101 100
		     <div class="mui-input-group mainbox" id="perfessorExperience">
102
				<div class="maincon">
103
			       <div class="infocontit">项目经历</div> 
104
			       <div class="infocon">
101
				<div class="maincon maincon2">
102
			       <div class="infocon infocon2tit">项目经历</div> 
103
			       <div class="infocon infocon2">
105 104
				       <ul class="mui-table-view listitembox" id="projectExperience">
106 105
				           <!--<li class="mui-table-view-cell mui-media listitem">
107 106
				               <a href="javascript:;">
@ -132,9 +131,9 @@
132 131
		       </div>
133 132
		    </div>
134 133
		     <div class="mui-input-group mainbox" id="perfessorpaperExperience">
135
				<div class="maincon">
136
			       <div class="infocontit">著作、论文、文章</div> 
137
			       <div class="infocon">
134
				<div class="maincon maincon2">
135
			       <div class="infocon infocon2tit">著作、论文、文章</div> 
136
			       <div class="infocon infocon2">
138 137
				       <ul class="mui-table-view listitembox" id="paperExperience">
139 138
				           <!--<li class="mui-table-view-cell mui-media listitem">
140 139
				               <a href="javascript:;">
@ -165,9 +164,9 @@
165 164
		       </div>
166 165
		    </div>
167 166
		    <div class="mui-input-group mainbox" id="perfessorpatentExperience">
168
				<div class="maincon">
169
			       <div class="infocontit">专利</div> 
170
			       <div class="infocon">
167
				<div class="maincon maincon2">
168
			       <div class="infocon infocon2tit">专利</div> 
169
			       <div class="infocon infocon2">
171 170
				       <ul class="mui-table-view listitembox" id="patentExperience">
172 171
				           <!--<li class="mui-table-view-cell mui-media listitem">
173 172
				               <a href="javascript:;">
@ -198,9 +197,9 @@
198 197
		       </div>
199 198
		    </div>
200 199
		    <div class="mui-input-group mainbox" id="perfessorhonor">
201
				<div class="maincon">
202
			       <div class="infocontit">荣誉及奖项</div> 
203
			       <div class="infocon">
200
				<div class="maincon maincon2">
201
			       <div class="infocon infocon2tit">荣誉及奖项</div> 
202
			       <div class="infocon infocon2">
204 203
				       <ul class="mui-table-view listitembox" id="honor">
205 204
				           <!--<li class="mui-table-view-cell mui-media listitem">
206 205
				               <a href="javascript:;">

+ 5 - 6
app/html/proinforbrow.html

@ -11,10 +11,9 @@
11 11
12 12
	<body>
13 13
		<header class="mui-bar mui-bar-nav toptitbox">
14
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
15
		    <h1 class="mui-title toptit">专家姓名</h1>
14
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>		   
16 15
		    <!--<a class="mui-icon iconfont icon-moreandroid mui-pull-right topmore"></a>-->
17
		    <a class="mui-icon iconfont icon-share mui-pull-right topmore" id="shareBtn">
16
		    <!--<a class="mui-icon iconfont icon-share mui-pull-right topmore" id="shareBtn">
18 17
		    	<ul class="sharebox" id="shareBox" style="display:none; color: #000000;">
19 18
		    		<li>
20 19
		    			<span class="mui-icon mui-icon-weixin"></span>
@ -27,7 +26,7 @@
27 26
		    		</li>
28 27
		    		
29 28
		    	</ul>
30
		    </a>
29
		    </a>-->
31 30
		</header>
32 31
		
33 32
		<!--主页面底部菜单-->
@ -54,7 +53,7 @@
54 53
				        	<img class="headimg headRadius" src="" />
55 54
				        	<div class="listtit "><span class="personalMaterial"></span><em class="mui-icon iconfont icon-vip authicon" style="font-size:16px;"></em></div>	
56 55
		                    <p class="listtit3"><span class="personalMaterial"></span><span class="personalMaterial"></span></p>
57
		                    <p cauthwordlass="listtit3"><span class="personalMaterial"></span><span class="personalMaterial"></span> <span class="personalMaterial"></span></p>
56
		                    <p cauthwordlass="listtit3"><span class="personalMaterial"></span><span class="personalMaterial"></span> <span class="personalMaterial"></span></p>
58 57
				        </a>
59 58
			        </div>
60 59
		        </div>
@ -160,7 +159,7 @@
160 159
			       </div>
161 160
		       </div>
162 161
		    </div>
163
		    <div class="mui-input-group mainbox">
162
		    <div class="mui-input-group mainbox"id="detailProfessor">
164 163
				<div class="maincon">
165 164
					<a >
166 165
						<div class="gotonext">

+ 18 - 18
app/html/proinforupdate-more.html

@ -18,9 +18,9 @@
18 18
    	<div class="mui-content">
19 19
    		<!-- 主界面具体展示内容 -->
20 20
    		<div class="mui-input-group mainbox">
21
				<div class="maincon">
22
			       <div class="infocontit">教育背景<a class="addinfobox mui-clearfix"><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
23
			       <div class="infocon">
21
				<div class="maincon maincon2">
22
			       <div class="infocon infocon2tit">教育背景<a class="addinfobox mui-clearfix"><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
23
			       <div class="infocon infocon2">
24 24
				       <ul class="mui-table-view listitembox" id="education">  
25 25
				           
26 26
				       </ul>	
@ -28,9 +28,9 @@
28 28
		       </div>
29 29
		    </div>
30 30
		    <div class="mui-input-group mainbox">
31
				<div class="maincon">
32
			       <div class="infocontit">工作经历<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
33
			       <div class="infocon">
31
				<div class="maincon maincon2">
32
			       <div class="infocon infocon2tit">工作经历<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
33
			       <div class="infocon infocon2">
34 34
				       <ul class="mui-table-view listitembox" id="soJob">
35 35
				           
36 36
				       </ul>	
@ -38,9 +38,9 @@
38 38
		       </div>
39 39
		    </div>
40 40
		     <div class="mui-input-group mainbox">
41
				<div class="maincon">
42
			       <div class="infocontit">项目经历<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
43
			       <div class="infocon">
41
				<div class="maincon maincon2">
42
			       <div class="infocon infocon2tit">项目经历<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
43
			       <div class="infocon infocon2">
44 44
				       <ul class="mui-table-view listitembox" id="projectExperience">
45 45
				           
46 46
				       </ul>	
@ -48,9 +48,9 @@
48 48
		       </div>
49 49
		    </div>
50 50
		     <div class="mui-input-group mainbox">
51
				<div class="maincon">
52
			       <div class="infocontit">著作、论文、文章<a class="addinfobox mui-clearfix"><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
53
			       <div class="infocon">
51
				<div class="maincon maincon2">
52
			       <div class="infocon infocon2tit">著作、论文、文章<a class="addinfobox mui-clearfix"><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
53
			       <div class="infocon infocon2">
54 54
				       <ul class="mui-table-view listitembox" id="paperExperience">
55 55
				           
56 56
				       </ul>	
@ -58,9 +58,9 @@
58 58
		       </div>
59 59
		    </div>
60 60
		    <div class="mui-input-group mainbox">
61
				<div class="maincon">
62
			       <div class="infocontit">专利<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
63
			       <div class="infocon">
61
				<div class="maincon maincon2">
62
			       <div class="infocon infocon2tit">专利<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
63
			       <div class="infocon infocon2">
64 64
				       <ul class="mui-table-view listitembox" id="patentExperience">
65 65
				            
66 66
				           
@ -69,9 +69,9 @@
69 69
		       </div>
70 70
		    </div>
71 71
		    <div class="mui-input-group mainbox">
72
				<div class="maincon">
73
			       <div class="infocontit">荣誉及奖项<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
74
			       <div class="infocon">
72
				<div class="maincon maincon2">
73
			       <div class="infocon infocon2tit">荣誉及奖项<a class="addinfobox mui-clearfix" ><em class="mui-icon mui-icon-plus addinfobtn mui-pull-left"></em><span class="mui-pull-left">点击添加</span></a></div> 
74
			       <div class="infocon infocon2">
75 75
				       <ul class="mui-table-view listitembox" id="honor">
76 76
				           
77 77
				           

+ 2 - 2
app/html/proinforupdate.html

@ -104,7 +104,7 @@
104 104
				<div class="maincon">
105 105
			       <div class="infocontit">研究方向<a class="updatebox mui-clearfix"><em class="mui-icon mui-icon-compose updatebtn mui-pull-left"></em><span class="mui-pull-left">点击修改</span></a></div> 
106 106
			       <div class="infocon reserachMess">
107
				        <div class="listbox">
107
				        <!--<div class="listbox">
108 108
				        	<div class="listbrowse mui-ellipsis">
109 109
				        		<span class="like">0</span>方向一方向一方向一方向一方向一方向一
110 110
				        	</div>
@ -125,7 +125,7 @@
125 125
				        		<span class="likepeople headRadius"><img class="like-h" src="../images/default-photo.jpg"></span>
126 126
				        		<span class="likepeople headRadius"><img class="like-h" src="../images/default-photo.jpg"></span>
127 127
				        	</div>
128
				        </div>
128
				        </div>-->
129 129
			       </div>
130 130
		       </div>
131 131
		    </div>

+ 2 - 2
app/html/resinforbrow.html

@ -12,7 +12,7 @@
12 12
	<body>
13 13
		<header class="mui-bar mui-bar-nav toptitbox">
14 14
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
15
		    <h1 class="mui-title toptit" id="resorcename">资源名称</h1>
15
		    <!--<h1 class="mui-title toptit" id="resorcename">资源名称</h1>
16 16
		    <a class="mui-icon iconfont icon-share mui-pull-right topmore" id="shareBtn">
17 17
		    	<ul class="sharebox" id="shareBox" style="display:none; color: #000000;">
18 18
		    		<li>
@ -26,7 +26,7 @@
26 26
		    		</li>
27 27
		    		
28 28
		    	</ul>
29
		    </a>
29
		    </a>-->
30 30
		</header>
31 31
		
32 32
		<!--主页面底部菜单-->

+ 2 - 2
app/html/resinforupdate.html

@ -12,7 +12,7 @@
12 12
	<body>
13 13
		<header class="mui-bar mui-bar-nav toptitbox">
14 14
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
15
		    <h1 class="mui-title toptit">资源名称</h1>
15
		    <!--<h1 class="mui-title toptit">资源名称</h1>
16 16
		    <a class="mui-icon iconfont icon-share mui-pull-right topmore" id="shareBtn">
17 17
		    	<ul class="sharebox" id="shareBox" style="display:none; color: #000000;">
18 18
		    		<li>
@ -26,7 +26,7 @@
26 26
		    		</li>
27 27
		    		
28 28
		    	</ul>
29
		    </a>
29
		    </a>-->
30 30
		</header>
31 31
		
32 32
		<!-- 主页面内容容器 -->

+ 29 - 8
app/js/proinfobrow.js

@ -93,9 +93,10 @@ mui.plusReady(function() {
93 93
94 94
					if($photos.length > 0) {
95 95
						for(var j = 0; j < $photos.length; ++j) {
96
							if($photos[j].hasHeadImage) {
97
								showDiv += "<span class='likepeople headRadius'><img class='like-h' src='../images/head/" + $photos[j] + "_s.jpg'></span>";
98
							} else {
96
						
97
							if($photos[j].img) {						
98
								showDiv += "<span class='likepeople headRadius'><img class='like-h' src='" + baseUrl + "/images/head/" + $photos[j].id + "_s.jpg'></span>";
99
							} else {								
99 100
								showDiv += "<span class='likepeople headRadius'><img class='like-h' src='../images/default-photo.jpg'></span>";
100 101
							}
101 102
						}
@ -134,7 +135,7 @@ mui.plusReady(function() {
134 135
				var string = '<li class="mui-table-view-cell mui-media" resouseId=' + $data[i].resourceId + '>'
135 136
				string += '<a class="proinfor">'
136 137
				if($data[i].images.length) {
137
					string += '<img class="mui-media-object mui-pull-left resimg" src="../images/resource/' + $data[i].resourceId + '.jpg">'
138
					string += '<img class="mui-media-object mui-pull-left resimg" src="'+baseUrl+'/images/resource/' + $data[i].resourceId + '.jpg">'
138 139
139 140
				} else {
140 141
@ -172,7 +173,7 @@ mui.plusReady(function() {
172 173
					start[i].classList.add("icon-favorfill");
173 174
				}
174 175
				if($data.hasHeadImage) {
175
					document.getElementsByClassName("headimg")[0].src = "/images/head/" + $data.id + "_l.jpg";
176
					document.getElementsByClassName("headimg")[0].src = baseUrl + "/images/head/" + $data.id + "_l.jpg";
176 177
				} else {
177 178
					document.getElementsByClassName("headimg")[0].src = "../images/default-photo.jpg";
178 179
				}
@ -182,16 +183,30 @@ mui.plusReady(function() {
182 183
					document.getElementsByClassName('icon-vip')[0].classList.add("unauthicon");
183 184
				}
184 185
				if($data.office) {
185
					personalMaterial[1].innerText = $data.office;
186
					if($data.title) {
187
						personalMaterial[1].innerText = $data.office + ",";
188
					} else {
189
						personalMaterial[1].innerText = $data.office;
190
					}
186 191
				}
187 192
				if($data.title) {
188 193
					personalMaterial[2].innerText = $data.title;
189 194
				}
190 195
				if($data.orgName) {
191
					personalMaterial[3].innerText = $data.orgName;
196
					if($data.department) {
197
						personalMaterial[3].innerText = $data.orgName + " , ";
198
					} else {
199
						personalMaterial[3].innerText = $data.orgName;
200
					}
201
192 202
				}
193 203
				if($data.department) {
194
					personalMaterial[4].innerText = $data.department;
204
					if($data.address) {
205
						personalMaterial[4].innerText = $data.department + " | ";
206
					} else {
207
						personalMaterial[4].innerText = $data.department;
208
					}
209
195 210
				}
196 211
				if($data.address) {
197 212
					personalMaterial[5].innerText = $data.address;
@ -228,6 +243,10 @@ mui.plusReady(function() {
228 243
				} else {
229 244
					document.getElementById("professorresourceList").style.display = "none";
230 245
				}
246
				//如无详细内容数据,隐藏详细点击的按钮
247
				if(!$data.edus.length && !$data.jobs.length && !$data.projects.length && !$data.papers.length && !$data.patents.length && !$data.honors.length) {
248
					document.getElementById("detailProfessor").style.display = "none";
249
				}
231 250
			},
232 251
			error: function() {
233 252
				plus.nativeUI.toast("服务器链接超时", toastStyle);
@ -281,6 +300,8 @@ mui.plusReady(function() {
281 300
282 301
				}
283 302
			})
303
		} else {
304
			plus.nativeUI.toast("请先登录");
284 305
		}
285 306
286 307
	})

+ 6 - 6
app/js/proinforupdate-more.js

@ -16,7 +16,7 @@ var eduBgShow = function(data) {
16 16
				                   string+='</div>'
17 17
				                   string+='<div class="mui-media-body">'
18 18
				                   if(data[i].school) {
19
							string += '<div class="listtit2">' + data[i].school + '<div class="updatebox updatebox2 edu" title=' + data[i].id + '><em class="mui-icon mui-icon-compose updatebtn"></em></div></div>'
19
							string += '<div class="listtit2 mutlinebox">' + data[i].school + '<div class="updatebox updatebox2 edu" title=' + data[i].id + '><em class="mui-icon mui-icon-compose updatebtn"></em></div></div>'
20 20
				                   }				                       
21 21
				                   string+='<p class="listtit3 mutlinebox">'
22 22
				                    if(data[i].college) {
@ -49,7 +49,7 @@ var eduBgShow = function(data) {
49 49
				               	   string+='<div class="mui-media-object mui-pull-left iconposition">'
50 50
				                   string+='<img class="" src="../images/icon-work.png"></div>'				                   
51 51
				                   string+='<div class="mui-media-body">'
52
				                       string+='<div class="listtit2">'
52
				                       string+='<div class="listtit2 mutlinebox">'
53 53
				                       if(data[i].company) {
54 54
				                       		string+=data[i].company;
55 55
				                       }
@ -87,7 +87,7 @@ var eduBgShow = function(data) {
87 87
						string += '<img class="" src="../images/icon-project.png">'
88 88
						string += '</div>'
89 89
						string += '<div class="mui-media-body">'
90
						string += '<div class="listtit2">'
90
						string += '<div class="listtit2 mutlinebox">'
91 91
						if(data[i].name) {
92 92
							string += data[i].name;
93 93
						}
@ -123,7 +123,7 @@ var eduBgShow = function(data) {
123 123
						string += '<img class="" src="../images/icon-acad.png">'
124 124
						string += '</div>'
125 125
						string += '<div class="mui-media-body">'
126
						string += '<div class="listtit2">'
126
						string += '<div class="listtit2 mutlinebox">'
127 127
						if(data[i].name) {
128 128
							string += data[i].name;
129 129
						}
@ -155,7 +155,7 @@ var eduBgShow = function(data) {
155 155
						string += '<img class="" src="../images/icon-mono.png">'
156 156
						string += '</div>'
157 157
						string += '<div class="mui-media-body">'
158
						string += '<div class="listtit2">'
158
						string += '<div class="listtit2 mutlinebox">'
159 159
						if(data[i].name) {
160 160
							string += data[i].name;
161 161
						}
@ -187,7 +187,7 @@ var eduBgShow = function(data) {
187 187
					string += '<img class="" src="../images/icon-honor.png">'
188 188
					string += '</div>'
189 189
					string += '<div class="mui-media-body">'
190
					string += '<div class="listtit2">'
190
					string += '<div class="listtit2 mutlinebox">'
191 191
					if(data[i].name) {
192 192
						string += data[i].name;
193 193
					}

+ 4 - 4
app/js/proinforupdate.js

@ -80,9 +80,9 @@ mui.ready(function() {
80 80
							isAgree++;
81 81
					}
82 82
					if(isAgree) {
83
						var showDiv = "<div class='listbox'><div class='listbrowse mui-ellipsis'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class=' mui-icon iconfont plusbtn  icon-appreciate' data-pid='" + $data.professorId + "' data-caption='" + $data.caption + "' data-isagree='" + isAgree + "' ></span><div class='likenum'>";
83
						var showDiv = "<div class='listbox'><div class='listbrowse mui-ellipsis'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><div class='likenum'>";
84 84
					} else {
85
						var showDiv = "<div class='listbox'><div class='listbrowse mui-ellipsis'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class=' mui-icon iconfont plusbtn icon-appreciatefill' data-pid='" + $data.professorId + "' data-caption='" + $data.caption + "' data-isagree='" + isAgree + "' ></span><div class='likenum'>";
85
						var showDiv = "<div class='listbox'><div class='listbrowse mui-ellipsis'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><div class='likenum'>";
86 86
					}
87 87

88 88
					if($photos.length > 0) {
@ -117,7 +117,7 @@ mui.ready(function() {
117 117
					personalMaterial[0].innerText = $data.name;
118 118
					//头像					
119 119
					if($data.hasHeadImage) {
120
						oImg.src = "/images/head/" + $data.id + "_l.jpg";
120
						oImg.src = baseUrl + "/images/head/" + $data.id + "_l.jpg";
121 121
					}
122 122
					//基本信息
123 123
					if(!$data.authentication) {
@ -185,7 +185,7 @@ mui.ready(function() {
185 185
				var string = '<li class="mui-table-view-cell mui-media" resouId=' + $data[i].resourceId + '>'
186 186
				string += '<a class="proinfor" href="resinforupdate.html">'
187 187
				if($data[i].images.length) {
188
					string += '<img class="mui-media-object mui-pull-left resimg" src="../images/resource/' + $data[i].resourceId + '.jpg">'
188
					string += '<img class="mui-media-object mui-pull-left resimg" src="'+baseUrl+'/images/resource/' + $data[i].resourceId + '.jpg">'
189 189
					console.log('../images/resource/' + $data[i].resourceId + '.jpg')
190 190
				} else {
191 191