Skip to content

H
hls-xcmg-vue-app
Commit 5e439375 authored by 王建文's avatar 王建文
Browse files
Options

首页图片替换

parent fc15b8e6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 872 additions and 539 deletions
config/dev.env.js
View file @ 5e439375
......@@ -2,8 +2,8 @@
module.exports = {
NODE_ENV: '"production"',
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true,
isMobilePlatform: true,
debug: false,
isMobilePlatform: false,
loginPath: '"http://210.12.156.64:9090/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://210.12.156.64:9090/r/api/interface?sysName=XCMG_UAT&apiName="',
rootPath: '"http://210.12.156.64:9090/r/api"',
......
config/prod.env.js
View file @ 5e439375
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://210.12.156.64:9090/r/api"',
fileUploadSvcPath:'"http://210.12.156.64:9090/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"3.6.2"'
currentVersion: '"3.6.6"'
}
src/components/rateInput.vue
View file @ 5e439375
......@@ -5,7 +5,7 @@
<template>
<input
:value="formatValue" :readonly="disable" type="text"
@blur="onBlur" @click="keyboradShow();onFocus($event)">
@focus="onFocus" @blur="onBlur" @click="keyboradShow">
</template>
<script>
......@@ -15,10 +15,20 @@ export default {
value: {
default: '',
},
check: {
default: '',
},
allCheck: {
default: '',
},
// disable: {
// type: Boolean,
// default: true,
// },
readonly: {
type: Boolean,
default: false,
},
content: {
type: String,
default: '',
......@@ -34,8 +44,8 @@ export default {
},
filter: {
uncurrency (val) {
if (!val) return ''
return Number((val).replace(/,|%/gi, ''))
if (!val) return null
return (Number((val).replace(/,/gi, ''))) === 0 ? 0 : Number((val).replace(/,/gi, ''))
},
},
computed: {
......@@ -43,7 +53,7 @@ export default {
let currency = this.$options.filters['rate']
if (!this.focused) {
if (this.value !== '' && this.value !== null) {
return `${currency(this.value*100)}%`
return `${currency(this.value)}%`
}
} else {
return this.value
......@@ -53,6 +63,7 @@ export default {
methods: {
keyboradShow () {
let vm = this
if (!vm.readonly) {
hlsPopup.showNumberKeyborad({
title: '数字键盘',
keyDown: (text) => {
......@@ -62,22 +73,25 @@ export default {
vm.onDelete()
},
})
}
},
onInput (value) {
// if (this.disable) return
// let uncurrency = this.$options.filter['uncurrency']
// this.newVal = uncurrency(this.value)
if (this.value === '0' || this.value === '0.00') {
this.newVal = ''
this.newVal += ('' + value)
} else {
this.newVal = this.value
if (this.newVal !=''&&this.newVal.includes('.') && value === '.') {
if (this.newVal.includes('.') && value === '.') {
} else {
this.newVal += ('' + value)
}
this.$emit('input', this.newVal/100)
}
this.$emit('input', this.newVal)
},
onDelete () {
this.newVal = ''
this.$emit('input', this.newVal/100)
this.$emit('input', this.newVal)
},
// onInput: function (value) {
// if (this.disable) return
......@@ -87,13 +101,12 @@ export default {
// },
onFocus (event) {
// if (this.disable) return
debugger
let vm = this
this.focused = true
let value = (event.target.value).trim()
let uncurrency = this.$options.filter['uncurrency']
let newVal = uncurrency(value)
event.target.value = newVal
let value = event.target.value
event.target.value = ''
event.target.value = value
setTimeout(function () {
let dom = document.querySelector('.content')
let veiwHeight = vm.getClientHeight()
......@@ -108,26 +121,37 @@ export default {
ele.setAttribute('class', 'add-height')
ele.style.height = (fontS - result + 44) + 'px'
ele.style.background = '#fff'
// setTimeout(() => {
dom.appendChild(ele)
// }, 100)
dom.scrollTop = scrollTop + (fontS - result + 44)
// dom.scrollTo(dom.scrollLeft, scrollTop + (256 - result))
}
console.log(veiwHeight, eleHeight, scrollTop, result)
console.log(veiwHeight, eleHeight, scrollTop, result, fontS)
event.target.type = 'text'
event.target.value = newVal
// event.target.focus()
event.target.focus()
}, 0)
},
onBlur (event) {
// if (this.disable) return
if (this.check && this.check < 1000) {
hlsPopup.showLongCenter('设备单价不能小于1000元!')
}
if (this.allCheck && this.allCheck < 1000) {
hlsPopup.showLongCenter('设备总价不能小于1000元!')
}
if (document.querySelector('.add-height')) {
document.querySelector('.content').removeChild(document.querySelector('.add-height'))
}
event.target.type = 'text'
event.target.blur()
this.focused = false
setTimeout(function () {
document.getElementsByTagName('body')[0].style.height = window.innerHeight + 'px'
}, 50)
},
// 取窗口可视范围的高度
getClientHeight () {
var clientHeight = 0
......@@ -138,7 +162,6 @@ export default {
}
return clientHeight
},
// 取窗口滚动条高度
getOffsetTop (obj) {
var tmp = obj.offsetTop
var node = obj.offsetParent
......
src/pages/contractSigning/contract-new.vue
View file @ 5e439375
This diff is collapsed.
src/pages/home/home-page.vue
View file @ 5e439375
......@@ -228,7 +228,7 @@ export default {
padding: 0 6px;
.card {
background: url("../../assets/homePage/home-card@2x.png") no-repeat;
background: url("../../assets/homePage/home-card1@2x.png") no-repeat;
background-size: 100% 100%;
height: 160px;
......
src/pages/login.vue
View file @ 5e439375
......@@ -313,7 +313,7 @@ export default {
opacity: 0;
}
#login {
background: url("../assets/login/background@3x.png") no-repeat;
background: url("../assets/login/background1@3x.png") no-repeat;
background-size: 100% 100%;
background-position-x: 0px;
color: #ffffff;
......
src/pages/regiester2.vue
View file @ 5e439375
......@@ -261,7 +261,7 @@ export default {
#register {
.content {
background: url("../assets/login/register-back@3x.png") no-repeat;
background: url("../assets/login/register-back1@3x.png") no-repeat;
background-size: 100% 100%;
}
......@@ -395,7 +395,6 @@ export default {
}
}
.return {
opacity: 1;
background: #fff;
......
src/pages/userBindNew/org/bankInfo.vue
View file @ 5e439375
......@@ -14,7 +14,7 @@
<p>推荐使用农行卡，农行卡支付免收手续费!</p>
</div>
<div class="my-card">
<div class="top">
<!-- <div class="top">
<div class="left">
<img src="@/assets/userBind/bankIcon.png" class="icon" >
<span class="top-word">
......@@ -23,8 +23,8 @@
</span>
</div>
<img src="@/assets/userBind/add.png" class="icon-right" @click="sendFlag" >
</div>
<div class="clear" />
</div> -->
<!-- <div class="clear" />
<div class="card-content">
<ul>
<li v-for="(item,index) in getBankList" :key="index">
......@@ -48,6 +48,51 @@
</li>
</ul>
</div>
</div> -->
<div class="modal-content">
<div class="modal-content-add-top">
<span>添加银行卡</span>
<!-- <img src="@/assets/userBind/close.png" @click="hideModal"> -->
</div>
<!-- <img-->
<!-- v-if="!bankImg"-->
<!-- src="@/assets/userBind/addBack.png"-->
<!-- class="addBack"-->
<!-- @click="ocrShow('bankCard', '')"-->
<!-- >-->
<!-- <img-->
<!-- v-if="bankImg"-->
<!-- :src="bankImg"-->
<!-- class="addBack"-->
<!-- style="height: 38%;"-->
<!-- @click="ocrShow('bankCard', '')"-->
<!-- >-->
<list-item :item-height="44" class="card-Info" style="margin-top: 50px;">
<item>
<div slot="name">账户名称</div>
<input slot="content" v-model="bank_lists.bank_account_name" placeholder="请输入账户名称">
</item>
<item>
<div slot="name">开户行</div>
<input
slot="content"
v-model="bank_lists.bank_full_name"
placeholder="请输入开户行"
>
</item>
<item>
<div slot="name">银行账号</div>
<input
slot="content"
v-model="bank_lists.bank_account_num"
placeholder="请输入银行账号"
>
</item>
<item>
<div slot="name">联行号</div>
<input slot="content" v-model="bank_lists.bank_branch_name" placeholder="请输入联行号">
</item>
</list-item>
</div>
<bottom-tab class="footer-button">
<tab-button class="save" @click.native="addCheck">提交</tab-button>
......@@ -57,21 +102,21 @@
<div class="modal-content">
<div class="modal-content-add-top">
<span>添加银行卡</span>
<img src="@/assets/userBind/close.png" @click="hideModal">
<!-- <img src="@/assets/userBind/close.png" @click="hideModal"> -->
</div>
<!-- <img-->
<!-- v-if="!bankImg"-->
<!-- src="@/assets/userBind/addBack.png"-->
<!-- class="addBack"-->
<!-- @click="ocrShow('bankCard', '')"-->
<!-- >-->
<!-- <img-->
<!-- v-if="bankImg"-->
<!-- :src="bankImg"-->
<!-- class="addBack"-->
<!-- style="height: 38%;"-->
<!-- @click="ocrShow('bankCard', '')"-->
<!-- >-->
<!-- <img-->
<!-- v-if="!bankImg"-->
<!-- src="@/assets/userBind/addBack.png"-->
<!-- class="addBack"-->
<!-- @click="ocrShow('bankCard', '')"-->
<!-- >-->
<!-- <img-->
<!-- v-if="bankImg"-->
<!-- :src="bankImg"-->
<!-- class="addBack"-->
<!-- style="height: 38%;"-->
<!-- @click="ocrShow('bankCard', '')"-->
<!-- >-->
<list-item :item-height="44" class="card-Info" style="margin-top: 50px;">
<item>
<div slot="name">账户名称</div>
......@@ -104,7 +149,7 @@
<tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
</bottom-tab>
</h-modal>
</h-view>
</div></h-view>
</template>
<script>
import backImg1 from '@/assets/userBind/nong.png'
......@@ -159,6 +204,30 @@ export default {
// 提交前校验
addCheck () {
let vm = this
if (!this.bank_lists.bank_account_num || !this.bank_lists.bank_account_name || !this.bank_lists.bank_full_name) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('银行信息不完整！')
} else {
this.bank_card_flag = true
}
// 银行卡验证this.hlsUtil.isBankAccount(this.bank.bank_account_num)
if (this.hlsUtil.isBankAccount(this.bank_lists.bank_account_num)) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('请输入正确银行账号！')
}
if (this.bank_card_flag) {
this.hlsPopup.showLoading('请稍候')
let url = $config.basePath + 'bp_bank_save'
let param = {
master: {
bp_id: JSON.parse(window.localStorage.getItem('handleUser')).bp_id,
bank_lists: [this.bank_lists],
},
}
let vm = this
vm.hlsHttp.post(url, param).then(function (res) {
if (res.result === 'S') {
let url = process.env.basePath + 'bp_attachment_check'
let param = {
bp_id: JSON.parse(window.localStorage.getItem('handleUser')).bp_id,
......@@ -176,6 +245,9 @@ export default {
}
})
}
}
})
}
},
// 银行卡查询
getBankInfo () {
......@@ -383,7 +455,7 @@ export default {
let url = $config.basePath + 'auth_user_sign'
let param = {
phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.getItem('handleUser')).bp_id
bp_id: JSON.parse(window.localStorage.getItem('handleUser')).bp_id,
}
hlsPopup.showLoading('请稍候')
let res = await vm.$post(url, param)
......@@ -536,9 +608,9 @@ export default {
}
.modal-content {
width: 100%;
height: 75%;
position: absolute;
top: 25%;
// height: 75%;
// position: absolute;
// top: 25%;
background-color: #fff;
overflow-y: scroll;
......
src/pages/userBindNew/org/baseInfo.vue
View file @ 5e439375
This diff is collapsed.
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