Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
bulomakaka
/
ekexiu.app
Vērot 2
Pievienot zvaigznīti 1
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Revīzijas 292 Laidieni 0 Vikivietne
Pārlūkot izejas kodu

Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.app.git

happy 8 gadi atpakaļ
vecāks
60d746f1c7 df7d8984b1
revīzija
0a6e310edc
7 mainītis faili ar 118 papildinājumiem un 105 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 2 2
      app/html/myaccount.html
  2. 3 0
      app/js/companybrowse.js
  3. 6 4
      app/js/consultapply.js
  4. 100 95
      app/js/myaccount.js
  5. 1 1
      app/js/proinfobrow.js
  6. 3 3
      app/js/resinforbrow.js
  7. 3 0
      app/js/studentbrowse.js

+ 2 - 2
app/html/myaccount.html
Parādīt failu 

@ -41,7 +41,7 @@
41 41 
			        </div>
42 42 
		        </div>
43 43 
		        <ul class="mui-table-view">
44 
				    <li class="mui-table-view-cell" id="NoActive">
44 
				    <li class="mui-table-view-cell" id="NoActive" >
45 45 
				        <a class="mui-navigate-right peocount"  id="goZixun">
46 46 
				        	<em class="mui-icon iconfont icon-community actionicon dialogicon mui-pull-left "></em>
47 47 
				        	<span class="mui-pull-left">已完成咨询<em id="zixunOk"></em>人次</span>
 
@ -124,7 +124,7 @@
124 124 
			        </div>
125 125 
		        </div>
126 126 
		        <ul class="mui-table-view">
127 
				    <li class="mui-table-view-cell">
127 
				    <li class="mui-table-view-cell" style="display:none;">
128 128 
				        <a class="mui-navigate-right peocount"  >
129 129 
				        	<em class="mui-icon iconfont icon-community actionicon dialogicon mui-pull-left "></em>
130 130 
				        	<span class="mui-pull-left">已完成咨询<em>0</em>人次</span>

+ 3 - 0
app/js/companybrowse.js
Parādīt failu 

@ -8,6 +8,9 @@ mui.plusReady(function() {
8 8 
	var userid = plus.storage.getItem('userid');
9 9 
	var self = plus.webview.currentWebview();
10 10 
	var proId = self.proid;
11 
	if(userid == proId) {
12 
		document.getElementsByClassName('footbox')[0].style.display = "none";
13 
	}
11 14 
	console.log(userid);
12 15 
	/*点击咨询*/
13 16 
	if(userid) {

+ 6 - 4
app/js/consultapply.js
Parādīt failu 

@ -97,9 +97,7 @@
97 97 
	 					oproadress.innerHTML = ' | '+myData["address"];//所在地
98 98 
	 				}
99 99 
	 				var starLevel = myData['starLevel'];
100 
	 				if(myData["consultCount"] == null || myData["consultCount"] == undefined ) {
101 
	 					ofinished.style.display="none";
102 
	 				}else {
100 
	 				if(myData["consultCount"]) {
103 101 
	 					oconsultcount.innerHTML =  myData["consultCount"];//咨询次数
104 102 
	 					if(!starLevel){
105 103 
	 						clickFlag=false;
 
@ -107,8 +105,12 @@
107 105 
						document.getElementsByClassName("levelbox")[0].style.display = "none";
108 106 
						document.getElementById("accessHistory").classList.remove("mui-navigate-right");
109 107 
	 					}
108 
	 				}else {
109 
	 					ofinished.style.display="none";
110 110 
	 				};
111
111 
	 				if(!myData.authType&&(myData.authentication == 2||myData.authentication == 3)){
112 
	 					ofinished.style.display="none";
113 
	 				}
112 114 
	 				/*是否认证*/
113 115 
					if(myData.authType) {
114 116 
						nameli.classList.add('icon-vip');

+ 100 - 95
app/js/myaccount.js
Parādīt failu 

@ -13,6 +13,8 @@ mui.ready(function() {
13 13 
	var nameli = document.getElementById("nameli");
14 14 
	var infobasic = document.getElementsByClassName("amend")[0];
15 15 
	var oFlag;
16 
	var oFlag1;
17 
	var clickFlag=true;
16 18 
	mui.plusReady(function() {
17 19
18 20 
		var userId = plus.storage.getItem('userid');

@ -42,9 +44,9 @@ mui.ready(function() {
42 44 
		});
43 45 
		//在修改上传图片触发的事件
44 46 
		window.addEventListener('photoUser', function(event) {
45 
					nameli.classList.remove(nameli.classList[2])
46 
					nameli.classList.remove(nameli.classList[2]);
47 
			nameli.innerHTML = ""
47 
			nameli.classList.remove(nameli.classList[2])
48 
			nameli.classList.remove(nameli.classList[2]);
49 
			nameli.innerHTML = ""
48 50 
			userInformation();
49 51 
		});
50 52 


@ -79,75 +81,75 @@ mui.ready(function() {
79 81
80 82 
				/*我的修改专家*/
81 83 
				infobasic.addEventListener('tap', function() {
82 
					if(oFlag == 1) {
83 
						mui.openWindow({
84 
							url: '../html/proinforupdate.html',
85 
							id: 'html/proinforupdate.html',
86 
							show: {
87 
								autoShow: false,
88 
								aniShow: "slide-in-left"
89 
							},
84 
						if(oFlag1||oFlag == 1) {
85 
							mui.openWindow({
86 
								url: '../html/proinforupdate.html',
87 
								id: 'html/proinforupdate.html',
88 
								show: {
89 
									autoShow: false,
90 
									aniShow: "slide-in-left"
91 
								},
90 92
91 
						});
92 
					} else if(oFlag == 2) {
93 
						/*我的修改企业工作者*/
94 
						mui.openWindow({
95 
							url: '../html/companyUpdata.html',
96 
							id: 'html/companyUpdata.html',
97 
							show: {
98 
								autoShow: false,
99 
								aniShow: "slide-in-left"
100 
							},
93 
							});
94 
						} else if(!oFlag1&&oFlag == 2) {
95 
							/*我的修改企业工作者*/
96 
							mui.openWindow({
97 
								url: '../html/companyUpdata.html',
98 
								id: 'html/companyUpdata.html',
99 
								show: {
100 
									autoShow: false,
101 
									aniShow: "slide-in-left"
102 
								},
101 103
102 
						});
103 
					} else if(oFlag == 3) {
104 
						/*我的修改学生*/
105 
						mui.openWindow({
106 
							url: '../html/studentUpdata.html',
107 
							id: 'html/studentUpdata.html',
108 
							show: {
109 
								autoShow: false,
110 
								aniShow: "slide-in-left"
111 
							},
104 
							});
105 
						} else if(!oFlag1&&oFlag == 3) {
106 
							/*我的修改学生*/
107 
							mui.openWindow({
108 
								url: '../html/studentUpdata.html',
109 
								id: 'html/studentUpdata.html',
110 
								show: {
111 
									autoShow: false,
112 
									aniShow: "slide-in-left"
113 
								},
112 114
113 
						});
114 
					}
115 
				})
116 
//				oEdit.addEventListener('tap', function() {
117 
//
118 
//						mui.openWindow({
119 
//							url: '../html/proinforupdate.html',
120 
//							id: 'html/proinforupdate.html',
121 
//							show: {
122 
//								autoShow: false,
123 
//								aniShow: "slide-in-left"
124 
//							},
125 
//
126 
//						});
127 
//					} else if(oFlag == 2) {
128 
//						/*我的修改企业工作者*/
129 
//						mui.openWindow({
130 
//							url: '../html/companyUpdata.html',
131 
//							id: 'html/companyUpdata.html',
132 
//							show: {
133 
//								autoShow: false,
134 
//								aniShow: "slide-in-left"
135 
//							},
136 
//
137 
//						});
138 
//					} else if(oFlag == 3) {
139 
//						/*我的修改学生*/
140 
//						mui.openWindow({
141 
//							url: '../html/studentUpdata.html',
142 
//							id: 'html/studentUpdata.html',
143 
//							show: {
144 
//								autoShow: false,
145 
//								aniShow: "slide-in-left"
146 
//							},
147 
//
148 
//						});
149 
//					}
150 
//				})
115 
							});
116 
						}
117 
					})
118 
					//				oEdit.addEventListener('tap', function() {
119 
					//
120 
					//						mui.openWindow({
121 
					//							url: '../html/proinforupdate.html',
122 
					//							id: 'html/proinforupdate.html',
123 
					//							show: {
124 
					//								autoShow: false,
125 
					//								aniShow: "slide-in-left"
126 
					//							},
127 
					//
128 
					//						});
129 
					//					} else if(oFlag == 2) {
130 
					//						/*我的修改企业工作者*/
131 
					//						mui.openWindow({
132 
					//							url: '../html/companyUpdata.html',
133 
					//							id: 'html/companyUpdata.html',
134 
					//							show: {
135 
					//								autoShow: false,
136 
					//								aniShow: "slide-in-left"
137 
					//							},
138 
					//
139 
					//						});
140 
					//					} else if(oFlag == 3) {
141 
					//						/*我的修改学生*/
142 
					//						mui.openWindow({
143 
					//							url: '../html/studentUpdata.html',
144 
					//							id: 'html/studentUpdata.html',
145 
					//							show: {
146 
					//								autoShow: false,
147 
					//								aniShow: "slide-in-left"
148 
					//							},
149 
					//
150 
					//						});
151 
					//					}
152 
					//				})
151 153
152 154 
				/*我的历史和评价*/
153 155 
				goZixun.addEventListener('tap', function() {

@ -181,6 +183,7 @@ mui.ready(function() {
181 183 
				success: function(data) {
182 184 
					var $info = data.data || {};
183 185 
					oFlag = $info.authentication;
186 
					oFlag1=$info.authType
184 187 
					console.log(oFlag)
185 188 
					if(data.success && data.data) {
186 189 
						document.getElementById("userName").innerText = $info.name || '';

@ -198,40 +201,42 @@ mui.ready(function() {
198 201 
							}
199 202
200 203 
						}
201 
						($info.office) ? userPosition.innerText =$info.office: userPosition.innerText = '';
204 
						($info.office) ? userPosition.innerText = $info.office: userPosition.innerText = '';
202 205 
						if($info.department) {
203 206 
							if($info.orgName) {
204 
								userDepartment.innerText=$info.department+"，"
205 
							}else{
206 
								if($info.address){
207 
									userDepartment.innerText=$info.department+" | "
208 
								}else{
209 
									userDepartment.innerText=$info.department;
207 
								userDepartment.innerText = $info.department + "，"
208 
							} else {
209 
								if($info.address) {
210 
									userDepartment.innerText = $info.department + " | "
211 
								} else {
212 
									userDepartment.innerText = $info.department;
210 213 
								}
211 214 
							}
212 215 
						}
213 216 
						if($info.orgName) {
214 
							if($info.address){
215 
									userMechanism.innerText=$info.orgName+" | "
216 
								}else{
217 
									userMechanism.innerText=$info.orgName;
218 
								}
217 
							if($info.address) {
218 
								userMechanism.innerText = $info.orgName + " | "
219 
							} else {
220 
								userMechanism.innerText = $info.orgName;
221 
							}
219 222 
						}
220 
						($info.address != '') ? userCity.innerText =$info.address: userCity.innerText = '';
223 
						($info.address != '') ? userCity.innerText = $info.address: userCity.innerText = '';
221 224 
						($info.consultCount != '') ? zixunOk.innerText = $info.consultCount: zixunOk.innerText = '0';
222
223 
						var startLeval = parseInt($info.starLevel);
224 
						if($info.consultCount){
225 
							 zixunOk.innerText = $info.consultCount;
226 
							 if(!startLeval){
227 
							 	clickFlag=false;
228 
						document.getElementById("NoActive").classList.add("NoActive");
229 
						document.getElementsByClassName("levelbox")[0].style.display = "none";
230 
						document.getElementById("goZixun").classList.remove("mui-navigate-right");
231 
							 }
232 
						}else{
233 
							goZixun.style.display="none";
225 
						var startLeval = parseInt($info.starLevel);
226 
						if($info.consultCount) {
227 
							zixunOk.innerText = $info.consultCount;
228 
							if(!startLeval) {
229 
								clickFlag = false;
230 
								document.getElementById("NoActive").classList.add("NoActive");
231 
								document.getElementsByClassName("levelbox")[0].style.display = "none";
232 
								document.getElementById("goZixun").classList.remove("mui-navigate-right");
233 
							}
234 
						} else {
235 
							goZixun.style.display = "none";
234 236 
						}
237 
						if(!$info.authType&&($info.authentication == 2||$info.authentication == 3)){
238 
							goZixun.style.display="none";
239 
							}
235 240 
						var start = document.getElementsByClassName("star");
236 241 
						for(var i = 0; i < startLeval; i++) {
237 242 
							start[i].classList.add("icon-favorfill");

@ -245,7 +250,7 @@ mui.ready(function() {
245 250 
						if($info.authType) {
246 251 
							nameli.classList.add('icon-vip');
247 252 
							nameli.classList.add('authicon-cu');
248 
							nameli.style.margin="-4px 0 0 -2px";
253 
							nameli.style.margin = "-4px 0 0 -2px";
249 254 
						} else {
250 255 
							if($info.authStatus) {
251 256 
								if($info.authentication == 1) {

+ 1 - 1
app/js/proinfobrow.js
Parādīt failu 

@ -190,7 +190,7 @@ mui.plusReady(function() {
190 190 
				if($data.consultCount) {
191 191 
					document.getElementsByClassName("consultCount")[0].innerText = $data.consultCount;
192 192 
					if(!startLeval){
193 
						clickFlag=false;
193 
						clickFlag=false;
194 194 
						document.getElementById("NoActive").classList.add("NoActive");
195 195 
						document.getElementsByClassName("levelbox")[0].style.display = "none";
196 196 
						document.getElementById("accessHistory").classList.remove("mui-navigate-right");

+ 3 - 3
app/js/resinforbrow.js
Parādīt failu 

@ -206,7 +206,7 @@ mui.plusReady(function() {
206 206 
					var $info = data.data || {}
207 207
208 208 
					if(data.success && data.data) {
209 
						if($info.authentication == 1) {
209 
						if($info.authType||$info.authentication == 1) {
210 210 
							mui.openWindow({
211 211 
								url: '../html/proinforbrow.html',
212 212 
								id: 'html/proinforbrow.html',
 
@ -218,7 +218,7 @@ mui.plusReady(function() {
218 218 
									proid: professorId
219 219 
								},
220 220 
							});
221 
						} else if($info.authentication == 2) {
221 
						} else if(!$info.authType&&$info.authentication == 2) {
222 222 
							mui.openWindow({
223 223 
								url: '../html/companybrowse.html',
224 224 
								id: 'html/companybrowse.html',
 
@ -230,7 +230,7 @@ mui.plusReady(function() {
230 230 
									proid: professorId
231 231 
								},
232 232 
							});
233 
						} else if($info.authentication == 3) {
233 
						} else if(!$info.authType&&$info.authentication == 3) {
234 234 
							mui.openWindow({
235 235 
								url: '../html/studentbrowse.html',
236 236 
								id: 'html/studentbrowse.html',

+ 3 - 0
app/js/studentbrowse.js
Parādīt failu 

@ -8,6 +8,9 @@ mui.plusReady(function() {
8 8 
	var userid = plus.storage.getItem('userid');
9 9 
	var self = plus.webview.currentWebview();
10 10 
	var proId = self.proid;
11 
	if(userid == proId) {
12 
		document.getElementsByClassName('footbox')[0].style.display = "none";
13 
	}
11 14 
	console.log(userid);
12 15 
	/*点击咨询*/
13 16 
	if(userid) {