Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

WebRoot/pindex.html

@@ -124,6 +124,8 @@
 
 			admin.render();
 
+			var from = 0;
+
 			$.ajax({
 				type: "GET",
 				async: false,
@@ -133,6 +135,7 @@
 						if (res.is_third_party == 1) {
 							$('#dd_changePwd').remove();
 							$('#dd_changeContact').remove();
+							from = 1;
 						}
 					}
 				}
@@ -140,17 +143,14 @@
 
 			// 登出逻辑 
 			admin.logout(function () {
-
 				popup.success("注销成功", function () {
 					window.location = "/QingLong/loginPerson/logout";
 				});
-
 				return true;
 			});
 
 			$("#changePwd").click(function () {
-				$(".layui-this").removeAttr("class");
-				//console.log($(".layui-this").removeClass("classname"));
+				$(".layui-this").removeAttr("class");				
 				layer.open({
 					type: 2,
 					title: '修改密码',
@@ -175,7 +175,7 @@
 			$.ajax({
 				type: "GET",
 				async: false,
-				url: '/QingLong/base/getCurrentPersonInfo?from=1',
+				url: '/QingLong/base/getCurrentPersonInfo?from=' + from,
 				dataType: "json",
 				success: function (res) {
 					$("#personName").html("  " + res.person_name);