Skip to content

H
hls-xcmg-vue-app
Commit 0066ac2d authored by 14699's avatar 14699
Browse files
Options

fix-zm页面调整

parent fa90dfe6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1992 additions and 1075 deletions
config/dev.env.js
View file @ 0066ac2d
......@@ -4,12 +4,12 @@ module.exports = {
CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
debug: true,
isMobilePlatform: true,
loginPath: '"http://47.97.108.99:18080/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://47.97.108.99:18080/r/api/interface?sysName=XCMG_UAT&apiName="',
rootPath: '"http://47.97.108.99:18080/r/api"',
filePath: '"http://47.97.108.99:18080/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
ocrPath:'"http://47.97.108.99:18080/r/api"',
fileUploadSvcPath:'"http://47.97.108.99:18080/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
loginPath: '"http://47.97.108.99:19808/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
basePath: '"http://47.97.108.99:19808/r/api/interface?sysName=XCMG_UAT&apiName="',
rootPath: '"http://47.97.108.99:19808/r/api"',
filePath: '"http://47.97.108.99:19808/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
ocrPath:'"http://47.97.108.99:19808/r/api"',
fileUploadSvcPath:'"http://47.97.108.99:19808/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"3.5.9"'
}
src/pages/contractSigning/contract-signing.vue
View file @ 0066ac2d
......@@ -18,7 +18,7 @@
</div>
<!-- 搜索 -->
<div class="search">
<input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称" />
<input v-model="searchInput" type="text" placeholder="请输入承租人名称" />
</div>
<scroll ref="scroll" :updateData="[showLists]" :pullUp="true" @pullingUp="loadMore">
......@@ -27,7 +27,7 @@
<div class="pro-code" @click="goDetails(item)">
<img src="@/assets/distributorSign/fileIcon.png" alt class="file-icon" />
<p>
<span>合同号</span>
<span>承租人</span>
<span>{{ item.project_number }}</span>
</p>
<img v-if="item.read_check === 'N'" src="@/assets/constractSigning/unread.png" alt class="unread" />
......@@ -53,18 +53,18 @@
<p>承租人</p>
<p>{{ item.bp_name }}</p>
</div>
<!-- <div>-->
<!-- <p>合同名称</p>-->
<!-- <p>{{ item.project_name }}</p>-->
<!-- </div>-->
<div>
<p>合同名称</p>
<p>{{ item.project_name }}</p>
</div>
<div>
<p>合同租金</p>
<p>设备总价</p>
<p class="money">{{ item.total_price | currency }}</p>
</div>
<div>
<p>产品名称</p>
<p>{{ item.division_n }}</p>
</div>
<!-- <div>-->
<!-- <p>产品名称</p>-->
<!-- <p>{{ item.division_n }}</p>-->
<!-- </div>-->
<div>
<p>申请时间</p>
<p>{{ dateConverse(item.confirm_start_date) }}</p>
......@@ -74,24 +74,24 @@
</div>
</div>
</scroll>
<div class="check-bottom">
<div class="choose" v-show="isRadio">
<div class="radio" @click="allChoose(!chooseAll)">
<img v-show="chooseAll" src="@/assets/login/radio.png" alt="radio" />
<div class="no-check" v-show="!chooseAll"></div>
<span :style="{ color: chooseAll ? '#1d3fff' : 'rgb(212,214,212)' }">全选</span>
</div>
<button class="cancel" @click="cancelRadio">× 取消批量</button>
<button class="sign" @click="signContract">签订征信授权书</button>
</div>
<!-- <div class="check-bottom">-->
<!-- <div class="choose" v-show="isRadio">-->
<!-- <div class="radio" @click="allChoose(!chooseAll)">-->
<!-- <img v-show="chooseAll" src="@/assets/login/radio.png" alt="radio" />-->
<!-- <div class="no-check" v-show="!chooseAll"></div>-->
<!-- <span :style="{ color: chooseAll ? '#1d3fff' : 'rgb(212,214,212)' }">全选</span>-->
<!-- </div>-->
<!-- <button class="cancel" @click="cancelRadio">× 取消批量</button>-->
<!-- <button class="sign" @click="signContract">签订征信授权书</button>-->
<!-- </div>-->
<div class="button-box" v-show="num == 1 && !isRadio">
<div class="go-radio" @click="isRadio = true">
<img src="@/assets/login/write.png" alt="icon" />
<span>批量签署</span>
</div>
</div>
</div>
<!-- <div class="button-box" v-show="num == 1 && !isRadio">-->
<!-- <div class="go-radio" @click="isRadio = true">-->
<!-- <img src="@/assets/login/write.png" alt="icon" />-->
<!-- <span>批量签署</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div v-if="showLists.length === 0">
<div class="display">
<img src="@/assets/messageCenter/noMsg.png" alt />
......@@ -190,8 +190,8 @@ export default {
signContract() {
let list = this.showLists.filter(item => item.checked);
if (!list.length) return hlsPopup.showLongCenter('请选择合同');
if(list.findIndex(item => item.read_check === 'N') > -1) return hlsPopup.showLongCenter('您有授权书未阅读，请阅读后再签署');
if(list.findIndex(item => item.read_check === 'N') > -1) return hlsPopup.showLongCenter('您有授权书未阅读，请阅读后再签署');
list = list.map(item => {item.checked = false; return item});
window.localStorage.setItem('handleContact', JSON.stringify(list));
this.$router.push({ path: '/batchSign', query: { name: 'contract' } });
......@@ -524,7 +524,7 @@ export default {
justify-content: center;
}
.go-radio {
.go-radio {
width: 90%;
color: #fff;
background-color: #1d3fff;
......
src/pages/distributorSign/legal-person.vue
View file @ 0066ac2d
......@@ -12,24 +12,24 @@
<div slot="name" class="font-color">业务经办</div>
<input slot="content" v-model="baseInfo.bp_user_id_n" readonly>
</item>
<item>
<div slot="name" class="font-color">{{ baseInfo.bp_id_agent? '经销商': '办事处' }}</div>
<span slot="content">{{ baseInfo.bp_id_agent?baseInfo.bp_id_agent_n:baseInfo.office_name }}</span>
</item>
<!-- <item>-->
<!-- <div slot="name" class="font-color">{{ baseInfo.bp_id_agent? '经销商': '办事处' }}</div>-->
<!-- <span slot="content">{{ baseInfo.bp_id_agent?baseInfo.bp_id_agent_n:baseInfo.office_name }}</span>-->
<!-- </item>-->
</list-item>
<div class="equipment-list">承租人信息</div>
<list-item :item-height="44" class="second-part">
<item>
<div slot="name" class="font-color">公司名称</div>
<input slot="content" v-model="baseInfo.bp_name" readonly>
<input slot="content" v-model="baseInfo.bp_name">
</item>
<item>
<div slot="name" class="font-color">营业执照号</div>
<input slot="content" v-model="baseInfo.organization_code" readonly>
<input slot="content" v-model="baseInfo.organization_code">
</item>
<item>
<div slot="name" class="font-color">注册资本</div>
<input slot="content" v-model="baseInfo.registered_capital" readonly>
<input slot="content" v-model="baseInfo.registered_capital" >
</item>
<item>
<div slot="name" class="font-color">注册地址</div>
......@@ -37,15 +37,19 @@
</item>
<item>
<div slot="name" class="font-color">经营地址</div>
<input slot="content" v-model="baseInfo.business_address" readonly>
<input slot="content" v-model="baseInfo.business_address" >
</item>
<item>
<div slot="name" class="font-color">固定电话</div>
<input slot="content" v-model="baseInfo.phone" readonly>
<input slot="content" v-model="baseInfo.phone" >
</item>
<item>
<div slot="name" class="font-color">是否授权</div>
<input slot="content" v-model="baseInfo.auth_flag" readonly>
<input slot="content" v-model="baseInfo.auth_flag" >
</item>
<item>
<div slot="name" class="font-color">是否征信授权</div>
<input slot="content" v-model="baseInfo.auth_flag" >
</item>
</list-item>
<div v-if="baseInfo.auth_flag === '是'" class="equipment-list">{{ '法定授权人' }}</div>
......
src/pages/distributorSign/personal.vue
View file @ 0066ac2d
......@@ -12,10 +12,10 @@
<div slot="name" class="font-color">业务经办</div>
<input slot="content" v-model="baseInfo.bp_user_id_n" readonly>
</item>
<item>
<div slot="name" class="font-color">{{ baseInfo.bp_id_agent? '经销商': '办事处' }}</div>
<span slot="content">{{ baseInfo.bp_id_agent?baseInfo.bp_id_agent_n:baseInfo.office_name }}</span>
</item>
<!-- <item>-->
<!-- <div slot="name" class="font-color">{{ baseInfo.bp_id_agent? '经销商': '办事处' }}</div>-->
<!-- <span slot="content">{{ baseInfo.bp_id_agent?baseInfo.bp_id_agent_n:baseInfo.office_name }}</span>-->
<!-- </item>-->
</list-item>
<div class="equipment-list">承租人信息</div>
<list-item :item-height="44" class="second-part">
......
src/pages/functionCenter/function-list.vue
View file @ 0066ac2d
This diff is collapsed.
src/pages/myInfo/my-info.vue
View file @ 0066ac2d
......@@ -59,21 +59,21 @@
<h-content class="my-content has-footer">
<div class="content-top">
<list-item :item-height="44" class="list">
<item @click.native="goContract">
<img slot="left-icon" src="@/assets/myInfo/agreement.png" class="left-icon" />
<div slot="name">我的合同</div>
</item>
<item
v-if="user_bp_type === 'TENANT' || user_bp_type === 'GUTA'"
@click.native="goReimburse"
>
<img slot="left-icon" src="@/assets/myInfo/repay.png" class="left-icon" />
<div slot="name">我的还款</div>
</item>
<item v-if="user_bp_type === 'TENANT'" @click.native="goInvoice">
<img slot="left-icon" src="@/assets/myInfo/invoice.png" class="left-icon" />
<div slot="name">我的发票</div>
</item>
<!-- <item @click.native="goContract">-->
<!-- <img slot="left-icon" src="@/assets/myInfo/agreement.png" class="left-icon" />-->
<!-- <div slot="name">我的合同</div>-->
<!-- </item>-->
<!-- <item-->
<!-- v-if="user_bp_type === 'TENANT' || user_bp_type === 'GUTA'"-->
<!-- @click.native="goReimburse"-->
<!-- >-->
<!-- <img slot="left-icon" src="@/assets/myInfo/repay.png" class="left-icon" />-->
<!-- <div slot="name">我的还款</div>-->
<!-- </item>-->
<!-- <item v-if="user_bp_type === 'TENANT'" @click.native="goInvoice">-->
<!-- <img slot="left-icon" src="@/assets/myInfo/invoice.png" class="left-icon" />-->
<!-- <div slot="name">我的发票</div>-->
<!-- </item>-->
<item @click.native="goMyProduct">
<img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" />
<div slot="name">我的收藏</div>
......@@ -304,14 +304,14 @@ export default {
// 自己添加认证文字
let register = {
NP_NO: "个人待认证",
NP_YES: "个人认证通过",
ORG_YES: "企业认证通过",
ORG_NO: "企业待认证",
ORG_L_NO: "法人待认证",
ORG_L_YES: "法人认证通过",
ORG_AUTH_NO: "授权人待认证",
ORG_AUTH_YES: "授权人认证通过"
NP_NO: "个人",
NP_YES: "个人",
ORG_YES: "企业",
ORG_NO: "企业",
ORG_L_NO: "法人",
ORG_L_YES: "法人",
ORG_AUTH_NO: "授权人",
ORG_AUTH_YES: "授权人"
}
query.lists = query.lists.map(item => {
......@@ -320,7 +320,7 @@ export default {
})
window.localStorage.setItem('bind-user-list', JSON.stringify(query.lists));
// window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(query.lists.length ? query.lists[0] : {}));
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(query.lists.length ? query.lists[0] : {}));
if (!query.lists.length)
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify({}));
......
src/pages/myInfo/myBindUser.vue
View file @ 0066ac2d
......@@ -96,11 +96,12 @@ export default {
methods: {
// 未认证进行人脸 认证
async face(item) {
return
let vm = this;
let register = ['NP_NO', 'ORG_NO', 'ORG_L_NO', 'ORG_AUTH_NO'];
if (register.includes(item.bp_identity)) {
// 人脸识别之前要确认是否已经在别的渠道已经绑定。
// 人脸识别之前要确认是否已经在别的渠道已经绑定。
let res = await vm.getNpCertificationUrl(item)
if (res) {
hlsPopup.showLongCenter(item.bp_identity === 'ORG_NO' ? '请联系业务人员协助认证' : '认证已通过');
......@@ -176,7 +177,7 @@ export default {
this.NowItem = item;
switch (item.bp_status) {
// 待提交 拒绝或者被退回
// 待提交 拒绝或者被退回
case "NEW":
case "RETURN":
case "REJECT":
......@@ -230,7 +231,7 @@ export default {
vm.hlsPopup.hideLoading();
if (res.result === 'S') {
vm.hlsPopup.showLongCenter('解绑成功');
// 重新查询一次 用户列表
// 重新查询一次 用户列表
vm.getList(item.bp_id === JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id);
} else {
vm.hlsPopup.showLongCenter(res.message)
......@@ -255,14 +256,14 @@ export default {
// 自己添加认证文字
let register = {
NP_NO: "个人待认证",
NP_YES: "个人认证通过",
ORG_YES: "企业认证通过",
ORG_NO: "企业待认证",
ORG_L_NO: "法人待认证",
ORG_L_YES: "法人认证通过",
ORG_AUTH_NO: "授权人待认证",
ORG_AUTH_YES: "授权人认证通过"
NP_NO: "个人",
NP_YES: "个人",
ORG_YES: "企业",
ORG_NO: "企业",
ORG_L_NO: "法人",
ORG_L_YES: "法人",
ORG_AUTH_NO: "授权人",
ORG_AUTH_YES: "授权人"
}
query.lists = query.lists.map(item => {
......
src/pages/regiester2.vue
View file @ 0066ac2d
......@@ -167,9 +167,11 @@ export default {
let length = vm.user_password.length
if (length < 6 || length > 20) {
hlsPopup.showLongCenter('密码长度6～20位之间')
} else if (new RegExp('^[0-9]*$').test(vm.user_password)) {
hlsPopup.showLongCenter('密码不能全为数字')
} else {
}
// else if (new RegExp('^[0-9]*$').test(vm.user_password)) {
// hlsPopup.showLongCenter('密码不能全为数字')
// }
else {
vm.passwordFlag = true
}
},
......@@ -227,22 +229,22 @@ export default {
getVerifiedCode () {
let vm = this
hlsPopup.showLongCenter('测试验证码为123456')
let url = process.env.basePath + 'sms_verify_post'
let signcode = '123456'
vm.captchaKey = signcode
let param = {
'phone': vm.phone_number,
'signcode': signcode,
}
vm.hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.hlsPopup.showSuccess('验证码已发送')
} else {
vm.hlsPopup.showLongCenter(res.return.description)
}
})
// let url = process.env.basePath + 'sms_verify_post'
// let signcode = '123456'
// vm.captchaKey = signcode
// let param = {
// 'phone': vm.phone_number,
// 'signcode': signcode,
// }
// vm.hlsPopup.showLoading('请稍候')
// vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.hlsPopup.showSuccess('验证码已发送')
// } else {
// vm.hlsPopup.showLongCenter(res.return.description)
// }
// })
},
},
}
......
src/pages/userBindNew/np/base-info.vue
View file @ 0066ac2d
This diff is collapsed.
src/pages/userBindNew/org/bankInfo.vue
View file @ 0066ac2d
......@@ -3,7 +3,7 @@
<h-header :proportion="[5,1,1]" class="bar-custom">
<div slot="left" class="h-header-btn" @click="$routeGo()">
<img src="@/assets/userBind/arrow.png">
<span>银行信息</span>
<span>收款账户信息</span>
</div>
</h-header>
<div class="info">
......@@ -59,45 +59,43 @@
<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">
<!-- <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>
<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_account_num"
readonly
placeholder="识别银行卡自动填充"
v-model="bank_lists.bank_full_name"
placeholder="请输入开户行"
>
</item>
<item>
<div slot="name">账户姓名</div>
<input slot="content" v-model="bank_lists.bank_account_name" placeholder="请输入账户名称">
</item>
<item>
<div slot="name">银行名称</div>
<div slot="name">银行账号</div>
<input
slot="content"
v-model="bank_lists.bank_full_name"
readonly
placeholder="识别银行卡自动填充"
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="请输入支行名称">
<div slot="name">联行号</div>
<input slot="content" v-model="bank_lists.bank_branch_name" placeholder="请输入联行号">
</item>
</list-item>
</div>
......@@ -165,9 +163,9 @@ export default {
let param = {
bp_id: JSON.parse(window.localStorage.getItem('handleUser')).bp_id,
}
if (window.localStorage.getItem('authFlag') === 'true') {
if (window.localStorage.getItem('authFlag') === 'true') {
vm.handSubmit()
} else {
} else {
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
......@@ -297,55 +295,55 @@ export default {
content: '您确认提交吗？',
onConfirm: d => {
if (d) {
if (vm.bp_identity === 'NP_NO' || vm.bp_identity === 'ORG_L_NO' || vm.bp_identity === 'ORG_AUTH_NO' || !vm.bp_identity) {
vm.hlsPopup.showConfirm({
title: '提示',
content: '当前用户尚未认证，是否需要认证',
cancelText: '直接提交',
confirmText: '先去认证',
onConfirm: c => {
if (c) {
// 只有自然人需要认证
let url = process.env.basePath + 'bp_query'
let param = {
bp_id: JSON.parse(window.localStorage.getItem('handleUser')).bp_id,
}
hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then((result) => {
hlsPopup.hideLoading()
if (result.result === 'S') {
let data = result.lists[0]
cordova.plugins.IdCardPlugin.idCardIdentify(
{
idNum: data.id_card_no,
idName: data.bp_name,
phoneNum: window.localStorage.user_phone,
},
function (suc) {
let success = JSON.parse(suc)
if (success.code === 1) {
vm.getNpCertificationUrl()
}
},
function (reason) {
let error = JSON.parse(reason)
vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
}
)
} else {
vm.hlsPopup.showLongCenter(result.message)
}
})
} else {
// 不校验的也直接提交
vm.submitBind()
}
},
})
} else {
// if (vm.bp_identity === 'NP_NO' || vm.bp_identity === 'ORG_L_NO' || vm.bp_identity === 'ORG_AUTH_NO' || !vm.bp_identity) {
// vm.hlsPopup.showConfirm({
// title: '提示',
// content: '当前用户尚未认证，是否需要认证',
// cancelText: '直接提交',
// confirmText: '先去认证',
// onConfirm: c => {
// if (c) {
// // 只有自然人需要认证
// let url = process.env.basePath + 'bp_query'
// let param = {
// bp_id: JSON.parse(window.localStorage.getItem('handleUser')).bp_id,
// }
// hlsPopup.showLoading('请稍候')
// vm.hlsHttp.post(url, param).then((result) => {
// hlsPopup.hideLoading()
// if (result.result === 'S') {
// let data = result.lists[0]
// cordova.plugins.IdCardPlugin.idCardIdentify(
// {
// idNum: data.id_card_no,
// idName: data.bp_name,
// phoneNum: window.localStorage.user_phone,
// },
// function (suc) {
// let success = JSON.parse(suc)
// if (success.code === 1) {
// vm.getNpCertificationUrl()
// }
// },
// function (reason) {
// let error = JSON.parse(reason)
// vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
// }
// )
// } else {
// vm.hlsPopup.showLongCenter(result.message)
// }
// })
// } else {
// // 不校验的也直接提交
// vm.submitBind()
// }
// },
// })
// } else {
// 已认证过的用户直接提交
vm.submitBind()
}
// }
}
},
})
......@@ -486,7 +484,7 @@ export default {
// 银行卡验证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('请输入正确银行卡号！')
this.hlsPopup.showLongCenter('请输入正确银行账号！')
}
if (this.bank_card_flag) {
this.hlsPopup.showLoading('请稍候')
......
src/pages/userBindNew/org/baseInfo.vue
View file @ 0066ac2d
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