XMTT 6 年 前
コミット
575a10fc1c
共有3 個のファイルを変更した116 個の追加48 個の削除を含む
  1. 45 8
      app/js/discoverNew.js
  2. 64 38
      app/js/professorArticle.js
  3. 7 2
      app/js/searchListNew2.js

+ 45 - 8
app/js/discoverNew.js

438
							this.innerHTML = data.data.name;
438
							this.innerHTML = data.data.name;
439
						}
439
						}
440
440
441
					}
442
				},
443
				platformName: function(data) {
444
					if(data.success) {
445
							this.innerHTML = data.data.name;
446
447
441
					}
448
					}
442
				},
449
				},
443
                questionModule:function(data) {
450
                questionModule:function(data) {
524
                                of = 1;
531
                                of = 1;
525
                            } else if ($data[i].articleType == 2 || $data[i].ctype == "2") {
532
                            } else if ($data[i].articleType == 2 || $data[i].ctype == "2") {
526
                                of = 2;
533
                                of = 2;
534
                            } else if ($data[i].articleType == 3) {
535
                                of = 3;
527
                            }
536
                            }
528
                            var arImg = "../images/default-artical.jpg";
537
                            var arImg = "../images/default-artical.jpg";
529
538
608
                                        sele: li.getElementsByClassName("nameSpan")[0]
617
                                        sele: li.getElementsByClassName("nameSpan")[0]
609
                                    });
618
                                    });
610
								}else{
619
								}else{
611
                                    li.setAttribute("owner-id", $data[i].professorId);
620
                                    li.setAttribute("owner-id", $data[i].ownerId);
612
                                    li.setAttribute("data-type", 1);
621
                                    li.setAttribute("data-type", 1);
613
                                    $D({
622
                                    $D({
614
                                        data: {},
623
                                        data: {},
615
                                        fun: ob.proName,
624
                                        fun: ob.proName,
616
                                        url: "/ajax/professor/editBaseInfo/" + $data[i].professorId,
625
                                        url: "/ajax/professor/editBaseInfo/" + $data[i].ownerId,
617
                                        sele: li.getElementsByClassName("nameSpan")[0]
626
                                        sele: li.getElementsByClassName("nameSpan")[0]
618
                                    });
627
                                    });
619
								}
628
								}
628
                                        sele: li.getElementsByClassName("nameSpan")[0]
637
                                        sele: li.getElementsByClassName("nameSpan")[0]
629
                                    });
638
                                    });
630
								}else{
639
								}else{
631
                                    li.setAttribute("owner-id", $data[i].onergId);
640
                                    li.setAttribute("owner-id", $data[i].ownenerId);
632
                                    li.setAttribute("data-type", 2);
641
                                    li.setAttribute("data-type", 2);
633
                                    $D({
642
                                    $D({
634
                                        data: {},
643
                                        data: {},
635
                                        fun: ob.orgName,
644
                                        fun: ob.orgName,
636
                                        url: "/ajax/org/" + $data[i].onergId,
645
                                        url: "/ajax/org/" + $data[i].ownenerId,
646
                                        sele: li.getElementsByClassName("nameSpan")[0]
647
                                    });
648
								}
649
							} else if (of == 3) {
650
                            	if (m==0&& !arguments[1]){
651
                                    li.setAttribute("owner-id", $data[i].uid);
652
                                    li.setAttribute("data-type", 4);
653
                                    $D({
654
                                        data: {id:$data[i].uid},
655
                                        fun: ob.platformName,
656
                                        url: "/ajax/platform/info" + $data[i].uid,
657
                                        sele: li.getElementsByClassName("nameSpan")[0]
658
                                    });
659
								}else{
660
                                    li.setAttribute("owner-id", $data[i].ownerId);
661
                                    li.setAttribute("data-type", 4);
662
                                    $D({
663
                                        data: {id:$data[i].ownerId},
664
                                        fun: ob.platformName,
665
                                        url: "/ajax/platform/info" + $data[i].ownerId,
637
                                        sele: li.getElementsByClassName("nameSpan")[0]
666
                                        sele: li.getElementsByClassName("nameSpan")[0]
638
                                    });
667
                                    });
639
								}
668
								}
912
						if(data.success) {
941
						if(data.success) {
913
							var ownerid;
942
							var ownerid;
914
							if(data.data.articleType == 1) {
943
							if(data.data.articleType == 1) {
915
								ownerid = data.data.professorId;
944
								ownerid = data.data.ownerId;
916
								plus.webview.create("../html/professorArticle.html", '../html/professorArticle.html', {}, {
945
								plus.webview.create("../html/professorArticle.html", '../html/professorArticle.html', {}, {
917
									articleId: id,
946
									articleId: id,
918
									ownerid: ownerid,
947
									ownerid: ownerid,
948
									oFlag:1
919
								});
949
								});
920
							} else {
921
								ownerid = data.data.orgId
950
							} else if(data.data.articleType == 2){
951
								ownerid = data.data.ownerid;
952
								plus.webview.create("../html/professorArticle.html", '../html/professorArticle.html', {}, {
953
									articleId: id,
954
									ownerid: ownerid,
955
									oFlag: 2
956
								});
957
							} else if(data.data.articleType == 3){
958
								ownerid = data.data.ownerId;
922
								plus.webview.create("../html/professorArticle.html", '../html/professorArticle.html', {}, {
959
								plus.webview.create("../html/professorArticle.html", '../html/professorArticle.html', {}, {
923
									articleId: id,
960
									articleId: id,
924
									ownerid: ownerid,
961
									ownerid: ownerid,
925
									oFlag: 1
962
									oFlag: 3
926
								});
963
								});
927
							}
964
							}
928
						}
965
						}

+ 64 - 38
app/js/professorArticle.js

7
	var proticleName = "";
7
	var proticleName = "";
8
	var oImgShare = ""
8
	var oImgShare = ""
9
	if(oFlag == 1) {
9
	if(oFlag == 1) {
10
		comBro();
11
		mui.ajax(baseUrl + "/ajax/org/authStatus", {
12
			dataType: 'json', //数据格式类型
13
			type: 'GET', //http请求类型
14
			timeout: 10000, //超时设置
15
			data: {
16
				"id": ownerid
17
			},
18
			success: function(data) {
19
				if(data.success) {
20
					document.getElementById("proInfor").addEventListener("tap", function() {
21
						mui.openWindow({
22
							url: '../html/cmpInforShow.html',
23
							id: 'cmpInforShow.html',
24
							show: {
25
								autoShow: false,
26
								aniShow: "slide-in-right",
27
							},
28
							extras: {
29
								cmpId: ownerid,
30
							}
31
						})
32
					})
33
				}
34
			},
35
			error: function(XMLHttpRequest) {
36
				console.log(XMLHttpRequest)
37
			}
38
		});
39
	} else {
40
		personMess();
41
		document.getElementById("proInfor").addEventListener("tap", function() {
42
			plus.nativeUI.showWaiting(); //显示原生等待框
43
			webviewShow = plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
44
				proid: ownerid
45
			}); //后台创建webview并打开show.html
46
		})
47
	}
10
        personMess();
11
        document.getElementById("proInfor").addEventListener("tap", function() {
12
            plus.nativeUI.showWaiting(); //显示原生等待框
13
            webviewShow = plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
14
                proid: ownerid
15
            }); //后台创建webview并打开show.html
16
        })
17
	} else if(oFlag == 2) {
18
        comBro();
19
        mui.ajax(baseUrl + "/ajax/org/authStatus", {
20
            dataType: 'json', //数据格式类型
21
            type: 'GET', //http请求类型
22
            timeout: 10000, //超时设置
23
            data: {
24
                "id": ownerid
25
            },
26
            success: function(data) {
27
                if(data.success) {
28
                    document.getElementById("proInfor").addEventListener("tap", function() {
29
                        mui.openWindow({
30
                            url: '../html/cmpInforShow.html',
31
                            id: 'cmpInforShow.html',
32
                            show: {
33
                                autoShow: false,
34
                                aniShow: "slide-in-right",
35
                            },
36
                            extras: {
37
                                cmpId: ownerid,
38
                            }
39
                        })
40
                    })
41
                }
42
            },
43
            error: function(XMLHttpRequest) {
44
                console.log(XMLHttpRequest)
45
            }
46
        });
47
	}else if(oFlag == 3){
48
        platfrom();
49
    }
48

50

49
	function proInfoMain() {
51
	function proInfoMain() {
50
		mui.ajax(baseUrl + "/ajax/article/query", {
52
		mui.ajax(baseUrl + "/ajax/article/query", {
120
			}
122
			}
121
		});
123
		});
122
	}
124
	}
125
	/*平台信息*/
126
	function platfrom() {
127
		mui.ajax(baseUrl + "/ajax/platform/info", {
128
			dataType: 'json', //数据格式类型
129
			type: 'GET', //http请求类型
130
			data:{id: ownerid},
131
			timeout: 10000, //超时设置
132
			success: function(data) {
133
				if(data.success && data.data) {
134
					var $platform = data.data;
135
					if($platform.hasHeadImage) {
136
						document.getElementById('proHead').src = baseUrl + "/data/platform" + data.data.logo;
137
					} else {
138
						document.getElementById('proHead').src = "../images/default-plat.jpg";
139
					}
140
					var proName = document.getElementById("proName");
141
					proName.innerText = $platform.name;
142
				}
143
			},
144
			error: function(XMLHttpRequest) {
145
				console.log(XMLHttpRequest)
146
			}
147
		});
148
	}
123
	/*企业信息*/
149
	/*企业信息*/
124
	function comBro() {
150
	function comBro() {
125
		mui.ajax(baseUrl + "/ajax/org/" + ownerid, {
151
		mui.ajax(baseUrl + "/ajax/org/" + ownerid, {

+ 7 - 2
app/js/searchListNew2.js

328
				for(var i = 0; i < $data.length; i++) {
328
				for(var i = 0; i < $data.length; i++) {
329
					var of ;
329
					var of ;
330
					if($data[i].articleType == 1) { of = 1;
330
					if($data[i].articleType == 1) { of = 1;
331
					} else { of = 2;
331
					} else if($data[i].articleType == 2){ of = 2;
332
					} else if($data[i].articleType == 3){ of = 3;
332
					}
333
					}
333
					var arImg = "../images/default-artical.jpg";
334
					var arImg = "../images/default-artical.jpg";
334
					if($data[i].articleImg) {
335
					if($data[i].articleImg) {
341
						li.setAttribute("owner-id", $data[i].professor.id);
342
						li.setAttribute("owner-id", $data[i].professor.id);
342
						li.setAttribute("data-type", 1);
343
						li.setAttribute("data-type", 1);
343
						name = $data[i].professor.name;
344
						name = $data[i].professor.name;
344
					} else {
345
					} else if( of == 2){
345
						li.setAttribute("owner-id", $data[i].editOrganization.id);
346
						li.setAttribute("owner-id", $data[i].editOrganization.id);
346
						li.setAttribute("data-type", 2);
347
						li.setAttribute("data-type", 2);
347
						if($data[i].editOrganization.forShort){
348
						if($data[i].editOrganization.forShort){
349
						}else{
350
						}else{
350
							name = $data[i].editOrganization.name;
351
							name = $data[i].editOrganization.name;
351
						}
352
						}
353
					} else if( of == 3){
354
						li.setAttribute("owner-id", $data[i].editOrganization.id);
355
						li.setAttribute("data-type", 3);
356
						name = $data[i].editOrganization.name;
352
					}
357
					}
353
					li.setAttribute("data-id", $data[i].articleId);
358
					li.setAttribute("data-id", $data[i].articleId);
354
					li.setAttribute("data-flag", 3);
359
					li.setAttribute("data-flag", 3);