Z991239-4995 #comment feat: 用户桌面修改1

addin/res/ManagerDesktop/css/errType.css

@@ -62,9 +62,6 @@ input[type="number"]{
 
 .btn-link{
 	color: #4D7BFE;
-	position: fixed;
-	bottom: 30px;
-	left: 5%;
 }
 
 /* 提示弹窗 prompt*/
@@ -472,6 +469,16 @@ nav ul li:nth-child(6)::before{
 .errType .scan-verify .btn-blue{
 	margin-top: 36px;
 }
+.scan-btns{
+	width: 90%;
+	display: flex;
+	justify-content: space-between;
+	position: fixed;
+	bottom: 30px;
+}
+.btn-next{
+	display: none;
+}
 /* 二维码验证End */
 
 /* 硬件检测Start */

addin/res/ManagerDesktop/entityCheck.html

@@ -118,7 +118,10 @@
 			<iframe frameborder="no" border="0" allowtransparency="yes" allow="microphone;camera;midi;encrypted-media;"
 				height="215" width="300" id="iframeSrc" src=""></iframe>
 			<p>请完成招乎扫码认证</p>
-			<button class="btn-link fz_24" onclick="exit()">退出</button>
+			<div class="scan-btns">
+				<button class="btn-link fz_24" onclick="exit()">退出</button>
+				<button class="btn-link fz_24 btn-next" onclick="handleNext()">下一步</button>
+			</div>
 		</div>
 		<!-- 初始化二维码验证 -->
 		

addin/res/ManagerDesktop/errPage.html

@@ -132,8 +132,10 @@
 						height="215" id="iframeSrc" src=""></iframe>
 					<p>请完成招乎扫码认证</p>
 				</div>
-				<button class="btn-link" onclick="exit()">退出</button>
-
+				<div class="scan-btns">
+					<button class="btn-link fz_24" onclick="exit()">退出</button>
+					<button class="btn-link fz_24 btn-next" onclick="handleNext()">下一步</button>
+				</div>
 				<!-- <div class="setting">
 					<h5 class="fz_24">下载主密钥</h5>
 					<div class="rows configAddr"> 

addin/res/ManagerDesktop/homePageErr.html

@@ -118,8 +118,10 @@
 			<iframe frameborder="no" border="0" allowtransparency="yes" allow="microphone;camera;midi;encrypted-media;"
 				height="215" width="300" id="iframeSrc" src=""></iframe>
 			<p>请完成招乎扫码认证</p>
-			<button class="btn-link fz_24" onclick="exit()">退出</button>
-		</div>
+			<div class="scan-btns">
+				<button class="btn-link fz_24" onclick="exit()">退出</button>
+				<button class="btn-link fz_24 btn-next" onclick="handleNext()">下一步</button>
+			</div>		</div>
 		<!-- 初始化二维码验证 -->
 		
 		<!-- 提示框 -->

addin/res/ManagerDesktop/js/getTerminalInfo.js

@@ -39,7 +39,6 @@ window.onload=function(){
   getHardwareInfo()
   // getAccessUrl()
 	getCertainAceessUrl() //准入接口
-	ReadCenterScanConfig() //读取扫码配置
 
 	$('#loadContent').fadeIn('slow');
 	$('.hardwareConfig').fadeOut() //页面开始加载的时候，强制隐藏一下硬件配置按钮

addin/res/ManagerDesktop/js/navOprator.js

@@ -131,65 +131,31 @@ function downLoadv3(value){
 }
 // *********************下载集中配置 End*********************/
 
-/**
- * @description: 读取配置 value=1，可以跳过扫码，直接重置密钥
- * @param {} 
- * @return: value=1
- */
-let jumpScan = false //是否跳过扫码
-function ReadCenterScanConfig(){
-	$('#loadContent').fadeIn('slow');
-	let timeoutFn= setTimeout(function(){
-		$('#loadContent').fadeOut('slow')
-		let tips = '请求超时'
-		ModalStyle(tips,'pathN')
-	},timeout)
-
-	let req = new Request();
-	req["{e12a3dc0-3a0b-47c4-a8c3-75190a42ae68}"]={
-		entity: 'AccessAuthorization' ,
-		key: 'SkipScanCode' ,
-		reserved1: 0,
-		reserved2: 0,
-		reserved3: '',
-		reserved4: '',
-		timeout: 60000,
-	}
-	HealthManagerService.ReadCenterConfigStr(req, function(ret) {
-		logEvent("ReadCenterConfigStr ret: "+JSON.stringify(ret));
-		console.log('ReadCenterScanConfig----',ret)
-		if(ret){
-			$('#loadContent').fadeOut('slow');
-			clearTimeout(timeoutFn)
-		}
-		if(ret.errorCode ===0&&ret.value==1){
-			jumpScan = true 
 
-		}else{
-			jumpScan = false 
-		}
-	})
+//跳过扫码
+function handleNext(){
+	$('#scanIdentity').fadeOut()
+	setTimeout(()=>{ //延时显示，避免内容污染
+		$('#RSAReseting').css({display:'flex'});
+		initializeNew('other')
+	},500)
 }
 
 
 // 密钥初始化Btn
-function resetRSA(){
+function resetRSA(){	
   $('#entityCheckout').fadeOut()
 	$('#serverNoAccess').fadeOut()
   $('#navBtns').fadeOut() //二维码没有菜单btns
-	console.log('jumpScan---',jumpScan)
-	if(jumpScan){
-		setTimeout(()=>{ //延时显示，避免内容污染
-			$('#RSAReseting').css({display:'flex'});
-			initializeNew('admin')
-		},500)
-	}else{
-		setTimeout(()=>{ //延时显示，避免内容污染
-			$('#scanIdentity').css({display:'flex'});
-		},300)
-	}
-	
+
+	setTimeout(()=>{ //延时显示，避免内容污染
+		$('#scanIdentity').css({display:'flex'});
+	},300)
 	getHardwareInfo()
+
+	setTimeout(()=>{ 
+		$('.btn-next').fadeIn()
+	},15000)
 }
 
 // 扫码登录后接收code
@@ -209,7 +175,6 @@ window.onmessage = (event) => {
 
 		}else{
 			document.getElementById('restDot').innerHTML = '重置设备密钥中，稍后自动重启应用<dot class="dot">●●●●●●</dot>'
-
 		}
 
   }
@@ -219,7 +184,7 @@ function initializeNew(code){
   let req = new Request()
   req.strAuthServer = HostUrl; 
   req.strUserID =  code 
-  req.strPassword = '88888888' //默认值，后台不做校验
+  req.strPassword = '' //默认值，后台不做校验
   req.timeout = 60000
 
   let timeoutFn= setTimeout(function(){
@@ -227,7 +192,6 @@ function initializeNew(code){
     ModalPrompt(tips,'pathN','InitializeNew')
     stopAnimation();
 		document.getElementById('restDot').innerHTML = '重置设备密钥失败，请重试或联系厂商维修'
-		$('.hardwareConfig').fadeIn()
   },timeout)
 
   //重置密钥
@@ -246,7 +210,12 @@ function initializeNew(code){
         let tips = ret.ErrMsg ? ret.ErrMsg : '重置密钥失败'
         ModalPrompt(tips,'pathN','InitializeNew')
 				document.getElementById('restDot').innerHTML = '重置设备密钥失败，请重试或联系厂商维修'
-				$('.hardwareConfig').fadeIn()
+				if(ret.Errcode == -1){
+					$('.hardwareConfig').fadeIn()
+				}else{
+					$('.hardwareConfig').fadeOut()
+				}
+				
       }else{
         let tips = '加载主密钥成功'
         ModalPrompt(tips,'pathY')
@@ -261,7 +230,6 @@ function initializeNew(code){
 			let tips = ret.errorMsg ? ret.errorMsg : '重置密钥失败'
 			ModalPrompt(tips,'pathN','InitializeNew')
 			document.getElementById('restDot').innerHTML = '重置设备密钥失败，请重试或联系厂商维修'
-			$('.hardwareConfig').fadeIn()
     }
   });
 }
@@ -292,6 +260,7 @@ function exit(){
 		$('#scanIdentity').fadeOut(); //二维码关闭
 		$('#RSAReseting').fadeOut(); //重置密钥中···关闭
 		$('#ManuallyDownload').fadeOut();
+		$('.btn-next').fadeOut() //···关闭
 
 		setTimeout(()=>{ //延时显示，避免内容污染
 			$('#entityCheckout').fadeIn('slow')

addin/res/ManagerDesktop/serverNoAccess.html

@@ -115,8 +115,10 @@
 			<iframe frameborder="no" border="0" allowtransparency="yes" allow="microphone;camera;midi;encrypted-media;"
 				height="215" width="300" id="iframeSrc" src=""></iframe>
 			<p>请完成招乎扫码认证</p>
-			<button class="btn-link fz_24" onclick="exit()">退出</button>
-		</div>
+			<div class="scan-btns">
+				<button class="btn-link fz_24" onclick="exit()">退出</button>
+				<button class="btn-link fz_24 btn-next" onclick="handleNext()">下一步</button>
+			</div>		</div>
 		<!-- 初始化二维码验证 -->
 		
 		<!-- 提示框 -->