Skip to content

H
hls-xcmg-vue-app
Commit cd4c91c6 authored by linxin's avatar linxin
Browse files
Options

add

parents ce942820 3c4cbe0c
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 63 deletions
config/dev.env.js
View file @ cd4c91c6
......@@ -23,5 +23,3 @@ module.exports = merge(prodEnv, {
config/uat.env.js
View file @ cd4c91c6
......@@ -11,6 +11,6 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"2.0.2"'
currentVersion: '"2.0.4"'
}
index.html
View file @ cd4c91c6
......@@ -22,16 +22,28 @@
<body>
<div id="app-box"></div>
<!-- built files will be auto injected -->
<!--<script>
if (window.history && window.history.pushState) {
// 往历史记录里面添加一条新的当前页面的url
history.pushState(null, null, document.URL)
// 给 popstate 绑定一个方法 监听页面刷新
window.addEventListener('popstate', function(){
history.pushState(null, null, location.href );
alert('请点击左上角返回按钮返回')
}, false) // false阻止默认事件
}
</script>-->
<script>
// if (window.history && window.history.pushState) {
// // 往历史记录里面添加一条新的当前页面的url
// history.pushState(null, null, document.URL)
// // 给 popstate 绑定一个方法 监听页面刷新
// window.addEventListener('popstate', function(){
// history.pushState(null, null, location.href );
// alert('请点击左上角返回按钮返回')
// }, false) // false阻止默认事件
// }
const u = navigator.userAgent;
if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { //安卓手机
window.addEventListener('resize', function () {
// Document 对象的activeElement 属性返回文档中当前获得焦点的元素。
if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'TEXTAREA') {
console.log('安卓触发', document.activeElement.tagName)
window.setTimeout(function() {
document.activeElement.scrollIntoView(false);
}, 50);
}
})
}
</script>
</body>
</html>
src/pages/contractCreate/add-undertake.vue
View file @ cd4c91c6
......@@ -164,6 +164,7 @@ export default {
margin: 0 auto;
}
.search {
position: absolute;
background-color: #fff;
padding: 8px 12px;
width: 100%;
......@@ -197,7 +198,14 @@ export default {
border: 2px solid #bcc6ff;
}
}
.content {
position: absolute;
top: 0;
}
.scrollContent {
padding-top: 2.92rem;
padding-bottom: 20px;
}
}
.platform-ios {
#person {
......
src/pages/contractCreate/creat-rent-info.vue
View file @ cd4c91c6
......@@ -846,7 +846,8 @@ export default {
}, */
setTime () {
if (!this.saveInfo.lease_start_date) {
let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/'))
let date = window.localStorage.getItem('signDate').replace(/-/g, '/')
let signDate = new Date(date)
let iToDay = signDate.getDate()
let iToMon = signDate.getMonth()
let iToYear = signDate.getFullYear()
......@@ -856,13 +857,15 @@ export default {
},
showTime (format) { // 预计付款日
let vm = this
let signDate = new Date(window.localStorage.getItem('signDate').replace(/-/, '/'))
let date = window.localStorage.getItem('signDate').replace(/-/g, '/')
let signDate = new Date(date)
let iToDay = signDate.getDate()
let iToMon = signDate.getMonth()
let iToYear = signDate.getFullYear()
let newDay = new Date(iToYear, iToMon, (iToDay + 30))
hlsPopup.showTime({
nowDate: newDay.format('yyyy-MM-dd'),
// nowDate: newDay.format('yyyy-MM-dd'),
nowDate: (new Date(iToYear, iToMon, (iToDay + 30))).format('yyyy-MM-dd'),
format: format,
callback: (date) => {
if (date >= (new Date()).format('yyyy-MM-dd')) {
......
src/pages/contractCreate/create-base-info.vue
View file @ cd4c91c6
......@@ -1202,47 +1202,6 @@ export default {
}
}
}
#add-person {
.item {
width: 359px;
margin: 0 auto;
}
.search {
background-color: #fff;
padding: 8px 12px;
width: 100%;
height: 1.02rem;
z-index: 100;
margin-bottom: 8px;
input {
background: url("../../assets/contractStart/search1.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
padding-left: 12px;
height: 36px;
line-height: 36px;
border-radius: 4px;
width: 100%;
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888c8f;
}
input::placeholder {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #888c8f;
letter-spacing: 0;
}
input:focus {
background: url("../../assets/contractStart/search2.png") 320px no-repeat;
background-size: 16px 16px;
background-color: rgba(239, 239, 239, 0.55);
border: 2px solid #bcc6ff;
}
}
}
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#add-person {
......
src/pages/home/home-page.vue
View file @ cd4c91c6
......@@ -55,7 +55,7 @@
<img src="@/assets/homePage/hot.png" class="hot">
<div class="center"><span class="firsts">{{ !list.office_id&&!list.agent_id?"-":(list.office_id?'办事处':'经销商') }}</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?"-":(list.office_id?list.office_name:list.agent_name) }}</span></div>
<div class="center"><span class="firsts">产品型号</span> <span class="seconds">{{ list.product_code }}</span></div>
<div class="center"><span class="firsts">地址</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?( list.province_id_n === list.city_id_n?list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n + list.district_id_n):(list.office_id? (list.office_province === list.office_city?list.office_city + list.office_district:list.office_province + list.office_city + list.office_district):(list.agent_province === list.agent_city?list.agent_city + list.agent_district:list.agent_province + list.agent_city + list.agent_district)) }}</span></div>
<div class="center"><span class="firsts">地址</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?( list.province_id_n === list.city_id_n?(list.district_id_n?list.city_id_n + list.district_id_n:list.city_id_n):(list.district_id_n?list.province_id_n + list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n )):(list.office_id? (list.office_province === list.office_city?(list.office_district?list.office_city + list.office_district:list.office_city ):(list.office_district?list.office_province + list.office_city + list.office_district:list.office_province + list.office_city)):(list.agent_province === list.agent_city?(list.agent_district?list.agent_city + list.agent_district:list.agent_city):(list.agent_district?list.agent_province + list.agent_city + list.agent_district:list.agent_province + list.agent_city))) }}</span></div>
</div>
</item>
</list-item>
......
src/pages/userBindNew/org/baseInfo.vue
View file @ cd4c91c6
......@@ -572,13 +572,13 @@ export default {
// 监听客户类型
'baseInfo.bp_type_n' () {
let vm = this
if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA' || vm.hasPeople) {
if (vm.baseInfo.bp_type === 'TENANT' || vm.baseInfo.bp_type === 'GUTA' || vm.hasPeople || vm.hasMultiRole) {
vm.type = '请输入业务经办员工代码'
vm.typeName = '业务经办人'
vm.bp_type_flag = true
} else if (
vm.baseInfo.bp_type === 'AGENT' ||
vm.baseInfo.bp_type === 'OFFICE' ||
vm.baseInfo.bp_type === 'OFFICE' ||
vm.baseInfo.bp_type === 'FACTORY'
) {
vm.bp_type_flag = false
......@@ -669,6 +669,8 @@ export default {
vm.licenseEditFlag = false // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
vm.LaEditFlag = false // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
vm.isClear = false
vm.bp_type_flag = false
vm.hasMultiRole = false
vm.idCardFrontUrlFlag = false // 身份证正面图片，为false则用查询出来的，为true则用拍照出来的
vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
......@@ -849,9 +851,12 @@ export default {
let res = await vm.hlsHttp.post(url, param)
if (res.result === 'S') {
vm.hasPeople = true
vm.bp_type_flag = true
return true
} else {
vm.hasMultiRole = false
vm.hasPeople = false
vm.bp_type_flag = false
return false
}
},
......
www/index.html
View file @ cd4c91c6
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.2d26a8118b22bdf724720e0998ae547e.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.41d8780e474d0e947bae.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.1ee7c8f25fc9d0545636f8758bfce112.css rel=stylesheet></head><body><div id=app-box></div><script>// if (window.history && window.history.pushState) {
// // 往历史记录里面添加一条新的当前页面的url
// history.pushState(null, null, document.URL)
// // 给 popstate 绑定一个方法 监听页面刷新
// window.addEventListener('popstate', function(){
// history.pushState(null, null, location.href );
// alert('请点击左上角返回按钮返回')
// }, false) // false阻止默认事件
// }
const u = navigator.userAgent;
if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { //安卓手机
window.addEventListener('resize', function () {
// Document 对象的activeElement 属性返回文档中当前获得焦点的元素。
if (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'TEXTAREA') {
console.log('安卓触发', document.activeElement.tagName)
window.setTimeout(function() {
document.activeElement.scrollIntoView(false);
}, 50);
}
})
}</script><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.ad59602f80332e42290e.js></script></body></html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment