JLBA202505130001_关于吉林银行新建AI智能培训系统的需求_修改配置文件并且合并冲突
This commit is contained in:
田岩
@@ -6,6 +6,7 @@ ENV = 'development'
|
||||
|
||||
|
||||
|
||||
|
||||
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
|
||||
|
||||
|
||||
|
||||
@@ -1240,7 +1240,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = HBuilder/HBuilder.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 285;
|
||||
CURRENT_PROJECT_VERSION = 291;
|
||||
DEVELOPMENT_TEAM = 2EP6SRRN43;
|
||||
ENABLE_BITCODE = NO;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
@@ -1322,7 +1322,7 @@
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
CURRENT_PROJECT_VERSION = 285;
|
||||
CURRENT_PROJECT_VERSION = 291;
|
||||
DEVELOPMENT_TEAM = "";
|
||||
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 2EP6SRRN43;
|
||||
ENABLE_BITCODE = NO;
|
||||
|
||||
BIN
Binary file not shown.
@@ -131,8 +131,6 @@
|
||||
<string></string>
|
||||
<key>NSPhotoLibraryUsageDescription</key>
|
||||
<string>从相册选择错题截图提交学习反馈、上传照片更换个人资料头像</string>
|
||||
<key>NSUserTrackingUsageDescription</key>
|
||||
<string>请放心，开启权限不会获取您在其他站点的隐私信息，该权限仅用于标识设备并保障服务安全与提示浏览体验</string>
|
||||
<key>StatusBarBackground</key>
|
||||
<string>#FFFFFF</string>
|
||||
<key>UIApplicationShortcutItems</key>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
||||
uni-view[data-v-2421641b],uni-scroll-view[data-v-2421641b],uni-swiper-item[data-v-2421641b]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uvicon-iconfont;src:url(../../assets/uvicons.04d281cc.ttf) format("truetype")}.uv-icon[data-v-2421641b]{display:flex;align-items:center}.uv-icon--left[data-v-2421641b]{flex-direction:row-reverse;align-items:center}.uv-icon--right[data-v-2421641b]{flex-direction:row;align-items:center}.uv-icon--top[data-v-2421641b]{flex-direction:column-reverse;justify-content:center}.uv-icon--bottom[data-v-2421641b]{flex-direction:column;justify-content:center}.uv-icon__icon[data-v-2421641b]{font-family:uvicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.uv-icon__icon--primary[data-v-2421641b]{color:#06f}.uv-icon__icon--success[data-v-2421641b]{color:#5ac725}.uv-icon__icon--error[data-v-2421641b]{color:#f56c6c}.uv-icon__icon--warning[data-v-2421641b]{color:#f9ae3d}.uv-icon__icon--info[data-v-2421641b]{color:#909399}.uv-icon__img[data-v-2421641b]{height:auto;will-change:transform}.uv-icon__label[data-v-2421641b]{line-height:1}.popup-view[data-v-20520c4b]{width:100vw;height:100vh}.body-title[data-v-20520c4b]{height:2.8125rem;text-align:center;font-size:1.03125rem;padding-top:.3125rem;line-height:1.4375rem;box-sizing:border-box;background-color:#fff;font-weight:500;color:#000;position:fixed;top:var(--status-bar-height);left:0;width:100vw;z-index:10000}.body-title .arrow-icon[data-v-20520c4b]{position:absolute;left:.65625rem;top:.15625rem;color:#000;padding:.46875rem}
|
||||
uni-view[data-v-2421641b],uni-scroll-view[data-v-2421641b],uni-swiper-item[data-v-2421641b]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uvicon-iconfont;src:url(../../assets/uvicons.04d281cc.ttf) format("truetype")}.uv-icon[data-v-2421641b]{display:flex;align-items:center}.uv-icon--left[data-v-2421641b]{flex-direction:row-reverse;align-items:center}.uv-icon--right[data-v-2421641b]{flex-direction:row;align-items:center}.uv-icon--top[data-v-2421641b]{flex-direction:column-reverse;justify-content:center}.uv-icon--bottom[data-v-2421641b]{flex-direction:column;justify-content:center}.uv-icon__icon[data-v-2421641b]{font-family:uvicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.uv-icon__icon--primary[data-v-2421641b]{color:#06f}.uv-icon__icon--success[data-v-2421641b]{color:#5ac725}.uv-icon__icon--error[data-v-2421641b]{color:#f56c6c}.uv-icon__icon--warning[data-v-2421641b]{color:#f9ae3d}.uv-icon__icon--info[data-v-2421641b]{color:#909399}.uv-icon__img[data-v-2421641b]{height:auto;will-change:transform}.uv-icon__label[data-v-2421641b]{line-height:1}.popup-view[data-v-4574acd6]{width:100vw;height:100vh}.body-title[data-v-4574acd6]{height:2.8125rem;text-align:center;font-size:1.03125rem;padding-top:.3125rem;line-height:1.4375rem;box-sizing:border-box;background-color:#fff;font-weight:500;color:#000;position:fixed;top:var(--status-bar-height);left:0;width:100vw;z-index:10000}.body-title .arrow-icon[data-v-4574acd6]{position:absolute;left:.65625rem;top:.15625rem;color:#000;padding:.46875rem}
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
+127
-118
@@ -1,126 +1,135 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="format-detection" content="telephone=no" />
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
|
||||
<meta http-equiv="pragma" content="no-cache">
|
||||
<meta http-equiv="cache-control" content="no-cache">
|
||||
<meta http-equiv="expires" content="0">
|
||||
<title>详情</title>
|
||||
<link rel="stylesheet" href="./pdf/style.css" />
|
||||
<link rel="stylesheet" href="./pdf/pdfh5.css" />
|
||||
<style>
|
||||
html,
|
||||
body {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.operate {
|
||||
position: fixed;
|
||||
bottom: 20px;
|
||||
right: 20px;
|
||||
width: 100px;
|
||||
padding: 5px;
|
||||
display: flex;
|
||||
background-color: rgba(0, 0, 0, 0.1);
|
||||
border-radius: 5px;
|
||||
z-index: 9999;
|
||||
}
|
||||
|
||||
#up,
|
||||
#down {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
font-size: 18px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#number {
|
||||
width: 50px;
|
||||
text-align: center;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
#percent {
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
#down {
|
||||
margin-left: 10px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="operate">
|
||||
<div id="up">+</div>
|
||||
<div id="number">100</div>
|
||||
<div id="percent">%</div>
|
||||
<div id="down">-</div>
|
||||
</div>
|
||||
<div id="pdf-view"></div>
|
||||
<script src="./pdf/pdf.js"></script>
|
||||
<script src="./pdf/pdf.worker.js"></script>
|
||||
<script src="./pdf/jquery-1.11.3.min.js" type="text/javascript" charset="utf-8"></script>
|
||||
<script src="./pdf/pdfh5.js" type="text/javascript" charset="utf-8"></script>
|
||||
<script type="text/javascript">
|
||||
var pdfh5;
|
||||
$(function () {
|
||||
$("#pdf-view").show()
|
||||
var url = getQuery('url');
|
||||
pdfh5 = new Pdfh5('#pdf-view', {
|
||||
pdfurl: url,
|
||||
lazy: true,
|
||||
renderType: 'png', // svg
|
||||
URIenable: true //开启浏览器地址栏file参数获取
|
||||
});
|
||||
|
||||
//pdf准备开始渲染，此时可以拿到pdf总页数
|
||||
pdfh5.on("ready", function () {
|
||||
console.log("pdf准备开始渲染，总页数：" + this.totalNum)
|
||||
})
|
||||
//监听pdf渲染成功
|
||||
pdfh5.on("success", function (time) {
|
||||
time = time / 1000
|
||||
console.log("pdf渲染完成，总耗时" + time + "秒");
|
||||
})
|
||||
})
|
||||
function getQuery(name) {
|
||||
// 正则：[找寻'&' + 'url参数名字' = '值' + '&']（'&'可以不存在）
|
||||
let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
|
||||
let r = window.location.search.substr(1).match(reg);
|
||||
if (r != null) {
|
||||
// 对参数值进行解码
|
||||
return decodeURIComponent(r[2]);
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="format-detection" content="telephone=no" />
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
|
||||
<meta http-equiv="pragma" content="no-cache">
|
||||
<meta http-equiv="cache-control" content="no-cache">
|
||||
<meta http-equiv="expires" content="0">
|
||||
<title>详情</title>
|
||||
<link rel="stylesheet" href="./pdf/style.css" />
|
||||
<link rel="stylesheet" href="./pdf/pdfh5.css" />
|
||||
<style>
|
||||
html,
|
||||
body {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
let count = 100;
|
||||
$('#up').click(function () {
|
||||
var div = $('.pdfjs .pdfViewer .pageContainer img')
|
||||
var width = div.width();
|
||||
var add = width / 10;
|
||||
count += 10;
|
||||
|
||||
div.width(width + add)
|
||||
$('#number').text(count);
|
||||
})
|
||||
$('#down').click(function () {
|
||||
var div = $('.pdfjs .pdfViewer .pageContainer img')
|
||||
var width = div.width();
|
||||
var add = width / 10;
|
||||
count -= 10;
|
||||
/* body {
|
||||
padding-bottom: 100px;
|
||||
} */
|
||||
|
||||
div.width(width - add)
|
||||
$('#number').text(count);
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
.operate {
|
||||
position: fixed;
|
||||
bottom: 20px;
|
||||
right: 20px;
|
||||
width: 100px;
|
||||
padding: 5px;
|
||||
display: flex;
|
||||
background-color: rgba(0, 0, 0, 0.1);
|
||||
border-radius: 5px;
|
||||
z-index: 9999;
|
||||
}
|
||||
|
||||
#up,
|
||||
#down {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
font-size: 18px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#number {
|
||||
width: 50px;
|
||||
text-align: center;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
#percent {
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
#down {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
/* #pdf-view {
|
||||
padding-bottom: 40px;
|
||||
} */
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div class="operate">
|
||||
<div id="up">+</div>
|
||||
<div id="number">100</div>
|
||||
<div id="percent">%</div>
|
||||
<div id="down">-</div>
|
||||
</div>
|
||||
<div id="pdf-view"></div>
|
||||
<script src="./pdf/pdf.js"></script>
|
||||
<script src="./pdf/pdf.worker.js"></script>
|
||||
<script src="./pdf/jquery-1.11.3.min.js" type="text/javascript" charset="utf-8"></script>
|
||||
<script src="./pdf/pdfh5.js" type="text/javascript" charset="utf-8"></script>
|
||||
<script type="text/javascript">
|
||||
var pdfh5;
|
||||
$(function() {
|
||||
$("#pdf-view").show()
|
||||
var url = getQuery('url');
|
||||
pdfh5 = new Pdfh5('#pdf-view', {
|
||||
pdfurl: url,
|
||||
lazy: true,
|
||||
renderType: 'png', // svg
|
||||
URIenable: true //开启浏览器地址栏file参数获取
|
||||
});
|
||||
|
||||
//pdf准备开始渲染，此时可以拿到pdf总页数
|
||||
pdfh5.on("ready", function() {
|
||||
console.log("pdf准备开始渲染，总页数：" + this.totalNum)
|
||||
})
|
||||
//监听pdf渲染成功
|
||||
pdfh5.on("success", function(time) {
|
||||
time = time / 1000
|
||||
console.log("pdf渲染完成，总耗时" + time + "秒");
|
||||
})
|
||||
})
|
||||
|
||||
function getQuery(name) {
|
||||
// 正则：[找寻'&' + 'url参数名字' = '值' + '&']（'&'可以不存在）
|
||||
let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
|
||||
let r = window.location.search.substr(1).match(reg);
|
||||
if (r != null) {
|
||||
// 对参数值进行解码
|
||||
return decodeURIComponent(r[2]);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
let count = 100;
|
||||
$('#up').click(function() {
|
||||
var div = $('.pdfjs .pdfViewer .pageContainer img')
|
||||
var width = div.width();
|
||||
var add = width / 10;
|
||||
count += 10;
|
||||
|
||||
div.width(width + add)
|
||||
$('#number').text(count);
|
||||
})
|
||||
$('#down').click(function() {
|
||||
var div = $('.pdfjs .pdfViewer .pageContainer img')
|
||||
var width = div.width();
|
||||
var add = width / 10;
|
||||
count -= 10;
|
||||
|
||||
div.width(width - add)
|
||||
$('#number').text(count);
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Reference in New Issue
Block a user