From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/EquipmentSetShippmentReceived1.page | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
index a0ae89d..f0df780 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
@@ -1,4 +1,4 @@
-<apex:page Controller="EquipmentSetShippmentReceived1Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="澶囧搧鍑哄簱鍏ュ簱">
+<apex:page Controller="EquipmentSetShippmentReceived1Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="澶囧搧鍑哄簱鍏ュ簱" lightningStylesheets="true">
<head>
<meta name="format-detection" content="telephone=no"/>
</head>
@@ -97,6 +97,7 @@
list-style-type: none;
padding: 0;
height: 25px;
+ /* lighting鍗囩骇 20230209 lt 鈥滀笅鏋垛�濃�滃嚭搴撴娴嬧�濇湁閲嶅彔闂 鍘绘帀 height: 35px; */
border-bottom: 5px solid #3b5998;
}
#Step_tab li {
@@ -165,7 +166,7 @@
<div id="myModal" class="modal">
<!-- Modal content -->
- <div class="modal-content" >
+ <div class="modal-content">
<span class="close" onclick="stopScan()">×</span>
<p>鎵弿涓�</p>
<p>Code:<input type="text" id="qrcode"/></p>
@@ -317,9 +318,6 @@
window.location.href="sfqr://scan";
} else {
j$(".modal").show();
- //add by rentx 20210927 start 154PB-7 鎵弿鐨勫璇濇鏄剧ず闈犲彸 涓嶈鎸′綇鏁版嵁灞曠ず
- j$(".modal-content").css("margin-left","350px");
- //add by rentx 20210927 end 154PB-7 鎵弿鐨勫璇濇鏄剧ず闈犲彸 涓嶈鎸′綇鏁版嵁灞曠ず
Instascan.Camera.getCameras().then(function (cameras) {
if (cameras.length > 0) {
if (ver >= 13) {
--
Gitblit v1.9.1