Skip to content

H
hls-xcmg-vue-app
Commit ee8afd7e authored by 胡's avatar 胡
Browse files
Options

feat

parent 7f34e61b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 346 additions and 287 deletions
config/uat.env.js
View file @ ee8afd7e
......@@ -11,5 +11,5 @@ 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: '"3.1.5"'
currentVersion: '"3.1.7"'
}
src/App.vue
View file @ ee8afd7e
......@@ -63,4 +63,8 @@ export default {
//-webkit-overflow-scrolling: touch;
//overflow-scrolling: touch;
}
.weui-dialog {
top: 30%;
}
</style>
src/pages/choose-user.vue
View file @ ee8afd7e
......@@ -65,9 +65,9 @@ export default {
let query = await this.hlsHttp.post(url, params);
if (query.result == 'S') {
this.hlsPopup.hideLoading();
this.hlsPopup.hideLoading();
// 认证
// 自己添加认证文字
let register = {
NP_NO: "个人认证未通过",
NP_YES: "个人认证通过",
......@@ -80,17 +80,21 @@ export default {
return item;
})
query.bp_identity_name =
window.localStorage.setItem('bind-user-list', JSON.stringify(query.lists));
this.list = query.lists;
// 一个都没有，直接跳过
if (!this.list.length) {
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify({}));
this.$router.push('tab');
}
// 如果只有一个，就不用选，直接跳
if (this.list.length === 1) {
this.list[0].checked = true;
this.next();
}
} else {
this.hlsPopup.hideLoading();
this.hlsPopup.showLongCenter(res.message);
......
src/pages/contractCreate/create-enclosure-info.vue
View file @ ee8afd7e
......@@ -638,7 +638,8 @@ export default {
let param = {
master: {
project_id: window.localStorage.project_id,
phone: window.localStorage.getItem('user_phone'),
// phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
},
}
vm.hlsPopup.showLoading('请稍候')
......
src/pages/contractRepayment/contract-repayment.vue
View file @ ee8afd7e
......@@ -69,7 +69,8 @@ export default {
let vm = this
let url = process.env.basePath + 'con_repayment_list_query'
let param = {
user_phone: window.localStorage.getItem('user_phone'),
// user_phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
pagenum: vm.pagenum,
}
......
src/pages/contractStart/add-car.vue
View file @ ee8afd7e
......@@ -1071,7 +1071,8 @@ export default {
let vm = this
let url = process.env.basePath + 'linked_contract_query'
let param = {
user_phone: window.localStorage.getItem('user_phone'),
// user_phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......
src/pages/contractStart/start-list.vue
View file @ ee8afd7e
......@@ -110,7 +110,8 @@ export default {
'&index' +
`'${randomString}'`
let param = {
user_phone: window.localStorage.getItem('user_phone'),
// user_phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
car_start_status: vm.status,
searchInput: vm.keyWord,
}
......@@ -170,7 +171,8 @@ export default {
'&index' +
`'${randomString}'`
let param = {
user_phone: window.localStorage.getItem('user_phone'),
// user_phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
pagenum: vm.status === 'APPROVED' ? vm.pagenumApproved : vm.pagenumNew,
searchInput: vm.keyWord,
......
src/pages/distributorSign/contract-list.vue
View file @ ee8afd7e
......@@ -144,7 +144,8 @@ export default {
pagenum: vm.submitPagenum,
searchInput: vm.searchInput,
confirm_status: 'SUBMIT',
user_phone: window.localStorage.user_phone,
// user_phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -169,7 +170,8 @@ export default {
pagenum: vm.approvedPagenum,
searchInput: vm.searchInput,
confirm_status: 'APPROVED',
user_phone: window.localStorage.user_phone,
// user_phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
}
vm.hlsPopup.showLoading('数据加载中')
vm.hlsHttp.post(url, param).then(function (res) {
......@@ -197,7 +199,8 @@ export default {
vm.submitPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
// user_phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
pagenum: vm.submitPagenum,
confirm_status: 'SUBMIT',
......@@ -231,7 +234,8 @@ export default {
vm.approvedPagenum++
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
// user_phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
pagenum: vm.approvedPagenum,
confirm_status: 'APPROVED',
......@@ -268,7 +272,8 @@ export default {
vm.submitPagenum = 1
let url = $config.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
// user_phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
pagenum: vm.submitPagenum,
confirm_status: 'SUBMIT',
......@@ -293,7 +298,8 @@ export default {
let url = $config.basePath + 'prj_confirm_list_query'
vm.approvedPagenum = 1
let param = {
user_phone: window.localStorage.user_phone,
// user_phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
pagenum: vm.approvedPagenum,
confirm_status: 'APPROVED',
......
src/pages/functionCenter/function-list.vue
View file @ ee8afd7e
......@@ -171,7 +171,7 @@ export default {
// },
methods: {
userQuery () {
// let vm = this
let vm = this
// let url = $config.basePath + 'user_query'
// let param = {
// phone: window.localStorage.getItem('user_phone'),
......
src/pages/functionCenter/to-do-list.vue
View file @ ee8afd7e
......@@ -187,7 +187,8 @@ export default {
this.todoList = []
let param = {
document_name: '',
phone: window.localStorage.getItem('user_phone'),
// phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagenum: this.pageNum,
pagesize: 10,
}
......@@ -211,7 +212,8 @@ export default {
this.doneList = []
let param = {
document_name: '',
phone: window.localStorage.getItem('user_phone'),
// phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagenum: this.pageNum_1,
pagesize: 10,
}
......@@ -239,7 +241,8 @@ export default {
param = {
document_name: this.searchInput,
pagenum: this.pageNum,
phone: window.localStorage.getItem('user_phone'),
// phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
}
} else if (this.selected === 'done') {
......@@ -248,7 +251,8 @@ export default {
param = {
document_name: this.searchInput,
pagenum: this.pageNum_1,
phone: window.localStorage.getItem('user_phone'),
// phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
pagesize: 10,
}
}
......
src/pages/intoApproval/into-list.vue
View file @ ee8afd7e
......@@ -137,7 +137,8 @@ export default {
let vm = this
let url = process.env.basePath + 'prj_confirm_list_query'
let param = {
user_phone: window.localStorage.user_phone,
// user_phone: window.localStorage.user_phone,
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
}
vm.hlsPopup.showLoading('数据加载中，请稍候!')
vm.hlsHttp.post(url, param).then(function (res) {
......
src/pages/myInfo/my-info.vue
View file @ ee8afd7e
......@@ -155,16 +155,16 @@ export default {
currentVersion: process.env.currentVersion,
// multipleRole: '',
upLoadObj: defaultImg, // 上传的图片
flag: true,
// flag: true,
// isAGENT: false,
popSetect: false, // true:待提交或者审核未通过
popSetectBox: false, // 弹出选择框
elecStatusDesceibe: '',
// popSetect: false, // true:待提交或者审核未通过
// popSetectBox: false, // 弹出选择框
// elecStatusDesceibe: '',
user_bp_status: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_status,
user_bp_class: '',
bp_id: '',
// user_bp_class: '',
// bp_id: '',
user_phone: window.localStorage.getItem('user_phone'),
user_bp_name: '',
// user_bp_name: '',
user_bp_type: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type,
// signCount: '0',
// carNum: '0',
......@@ -173,14 +173,15 @@ export default {
// confirmCount: '0',
productCount: '0',
// carCount: '9',
description: '',
bp_identity: '',
bp_type_n: '',
approveBtn: false,
elecStatus: false,
authFlag: false,
// description: '',
// bp_identity: '',
// bp_type_n: '',
// approveBtn: false,
// elecStatus: false,
// authFlag: false,
roleSwitchFlag: false, // 选择角色模态框显示标志
multiRoleList: [], // 查到的多角色
app_user_id: window.localStorage.getItem('app_user_id'),
// type: [
// {
// bp_type: '0',
......@@ -204,66 +205,67 @@ export default {
return this.bindUserList;
}
},
watch: {
// user_bp_type (newVal, oldVal) {
// if (newVal === 'AGENT') {
// this.isAGENT = true
// } else {
// this.isAGENT = false
// }
// },
bp_identity(newVal, oldVal) {
switch (newVal) {
case 'NP_NO': {
this.elecStatusDesceibe = '个人待认证'
this.elecStatus = false
break
}
case 'NP_YES': {
this.elecStatusDesceibe = '个人认证通过'
this.elecStatus = true
break
}
case 'ORG_NO': {
this.elecStatusDesceibe = '企业待认证'
this.elecStatus = false
break
}
case 'ORG_YES': {
this.elecStatusDesceibe = '企业认证通过'
this.elecStatus = true
break
}
case 'ORG_L_NO': {
this.elecStatusDesceibe = '法人待认证'
this.elecStatus = false
break
}
case 'ORG_L_YES': {
this.elecStatusDesceibe = '法人认证通过'
this.elecStatus = true
break
}
case 'ORG_AUTH_NO': {
this.elecStatusDesceibe = '授权人待认证'
this.elecStatus = false
break
}
case 'ORG_AUTH_YES': {
this.elecStatusDesceibe = '授权人认证通过'
this.elecStatus = true
break
}
default: {
this.elecStatusDesceibe = '用户未绑定'
this.elecStatus = false
break
}
}
},
},
// watch: {
// user_bp_type (newVal, oldVal) {
// if (newVal === 'AGENT') {
// this.isAGENT = true
// } else {
// this.isAGENT = false
// }
// },
// bp_identity(newVal, oldVal) {
// switch (newVal) {
// case 'NP_NO': {
// this.elecStatusDesceibe = '个人待认证'
// this.elecStatus = false
// break
// }
// case 'NP_YES': {
// this.elecStatusDesceibe = '个人认证通过'
// this.elecStatus = true
// break
// }
// case 'ORG_NO': {
// this.elecStatusDesceibe = '企业待认证'
// this.elecStatus = false
// break
// }
// case 'ORG_YES': {
// this.elecStatusDesceibe = '企业认证通过'
// this.elecStatus = true
// break
// }
// case 'ORG_L_NO': {
// this.elecStatusDesceibe = '法人待认证'
// this.elecStatus = false
// break
// }
// case 'ORG_L_YES': {
// this.elecStatusDesceibe = '法人认证通过'
// this.elecStatus = true
// break
// }
// case 'ORG_AUTH_NO': {
// this.elecStatusDesceibe = '授权人待认证'
// this.elecStatus = false
// break
// }
// case 'ORG_AUTH_YES': {
// this.elecStatusDesceibe = '授权人认证通过'
// this.elecStatus = true
// break
// }
// default: {
// this.elecStatusDesceibe = '用户未绑定'
// this.elecStatus = false
// break
// }
// }
// },
// },
mounted() {
this.getMultipleRole();
this.getHead();
},
beforeRouteEnter(to, from, next) {
next((vm) => {
......@@ -441,7 +443,7 @@ export default {
// },
// 进入我的还款
goReimburse() {
if (this.bp_id) {
if (this.nowBind.bp_id) {
this.$router.push({
name: 'ReimburseMyselfList',
})
......@@ -662,15 +664,18 @@ export default {
let vm = this
this.hlsPopup.showActionSheet({
buttonArray:
vm.user_bp_type === 'MANAGER' ? ['修改头像'] : ['修改头像', '用户信息', '角色切换'],
vm.user_bp_type === 'MANAGER' ? ['修改头像'] : ['修改头像', '角色切换'],
// '角色切换'
callback: (index) => {
if (index === 0) {
this.imgUploadShow(vm.app_user_id)
} else if (index === 1) {
this.changePageHead(this.nowBind);
} else if (index === 2) {
console.log(vm.user_bp_type);
console.log(vm.user_bp_status);
}
// else if (index === 2) {
// this.changePageHead(this.nowBind);
// }
else if (index === 1) {
// console.log(vm.user_bp_type);
// console.log(vm.user_bp_status);
if (
(vm.user_bp_type === 'TENANT' ||
vm.user_bp_type === 'GUTA' ||
......@@ -699,7 +704,11 @@ export default {
}
vm.hlsHttp.post(url, param).then(function (res) {
if (res.result === 'S') {
vm.multiRoleList = res.lists
let obj = {
bp_type: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_type,
bp_type_n: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_type_n,
}
vm.multiRoleList = [...res.lists, obj]
}
})
},
......@@ -1182,9 +1191,13 @@ export default {
align-items: center;
span {
font-size: 85%;
font-size: 15px;
color: orange;
margin: 0;
max-width: 180px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
div {
......
src/pages/myInfo/myBindUser.vue
View file @ ee8afd7e
......@@ -9,7 +9,7 @@
<scroll ref="scrollLists" :updateData="[prolists]" :pullUp="false">
<div class="scroll-box">
<div class="box" v-for="item of list" :key="item.bp_id">
<div class="box" v-for="item of list" :key="item.bp_id" @click.stop="changePageHead(item)">
<div class="name">
<img
v-if="item.bp_class === 'NP'"
......@@ -20,10 +20,10 @@
<span>{{ item.bp_name }}</span>
</div>
<div class="flag">
<div @click="face(item)">{{ item.bp_identity_name }}</div>
<div @click.stop="face(item)">{{ item.bp_identity_name }}</div>
<div
:class="['normal', { unbind: item.bp_status === 'APPROVED' }]"
@click="doStatus(item)"
@click.stop="doStatus(item)"
>{{ item.bp_status === 'APPROVED' ? '× 解绑' : item.bp_status_n }}</div>
</div>
</div>
......@@ -279,10 +279,9 @@ export default {
background-color: #fff;
border-radius: 8px;
line-height: 60px;
font-size: 80%;
font-size: 16px;
color: rgb(58, 58, 58);
margin-bottom: 0.15rem;
margin-bottom: 0.15rem;
img {
height: 20px;
vertical-align: text-bottom;
......@@ -312,7 +311,7 @@ export default {
border: 1px solid #1d3fff;
line-height: 19.5px;
text-align: center;
font-size: 0.12rem;
font-size: 13px;
padding: 0 4px;
color: #1d3fff;
}
......
src/pages/myInfo/setting.vue
View file @ ee8afd7e
......@@ -15,10 +15,10 @@
</item>
</list-item>
<list-item :item-height="50" class="list">
<item v-if="bpId!=='undefined'" v-show="user_bp_type!='MANAGER'" @click.native="changePageHead()">
<!-- <item v-if="bpId!=='undefined'" v-show="user_bp_type!='MANAGER'" @click.native="changePageHead()">
<div slot="name" style="color:#656464;">修改信息</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
</item>
</item> -->
<item v-if="user_bp_type!='MANAGER'" @click.native="changeRole()">
<div slot="name" style="color:#656464;">角色切换</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
......@@ -33,10 +33,10 @@
</div>
<div slot="right-icon" style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{ currentVersion }}</div>
</item>
<item v-if="user_bp_type!='MANAGER'" @click.native="unBind()">
<!-- <item v-if="user_bp_type!='MANAGER'" @click.native="unBind()">
<div slot="name" style="color:#656464;">解除绑定</div>
<div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
</item>
</item> -->
</list-item>
</div>
</h-content>
......@@ -67,7 +67,7 @@ export default {
bp_id: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_id,
user_bp_name: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_name,
user_bp_class: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_class,
isMultiRole: window.localStorage.getItem('multipleRole'),
isMultiRole: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_type,
roleSwitchFlag: false,
user_bp_type: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_type,
bp_type_n: '',
......@@ -75,8 +75,10 @@ export default {
version_url: '',
update_content: '',
multiRoleList: [],
multipleRole: window.localStorage.getItem('multipleRole'),
// multipleRole: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_type,
bpId: window.localStorage.bp_id,
nowBind: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')),
}
},
computed: {
......@@ -99,7 +101,7 @@ export default {
},
beforeRouteEnter (to, from, next) {
next(vm => {
console.log(vm.currentVersion)
// console.log(vm.currentVersion)
vm.getVersion()
})
},
......@@ -107,17 +109,22 @@ export default {
// 选择角色后确定
roleConfirm (role) {
this.roleSwitchFlag = false
if (role.bp_type === 'TENANT') {
window.localStorage.setItem('multipleRole', 'TENANT')
this.multipleRole = 'TENANT'
} else if (role.bp_type === 'GUTA') {
window.localStorage.setItem('multipleRole', 'GUTA')
this.multipleRole = 'GUTA'
} else if (role.bp_type === 'AGENT') {
window.localStorage.setItem('multipleRole', 'AGENT')
this.multipleRole = 'AGENT'
}
console.log('选择后的角色为：' + role)
// if (role.bp_type === 'TENANT') {
// window.localStorage.setItem('multipleRole', 'TENANT')
// this.multipleRole = 'TENANT'
// } else if (role.bp_type === 'GUTA') {
// window.localStorage.setItem('multipleRole', 'GUTA')
// this.multipleRole = 'GUTA'
// } else if (role.bp_type === 'AGENT') {
// window.localStorage.setItem('multipleRole', 'AGENT')
// this.multipleRole = 'AGENT'
// }
this.nowBind = { ...this.nowBind, bp_type: role.bp_type, bp_type_n: role.bp_type_n };
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(this.nowBind));
// console.log('选择后的角色为：' + role)
},
// 选择角色后取消
roleCancle () {
......@@ -174,8 +181,7 @@ export default {
}
})
},
getMultipleRole () {
let vm = this
getMultipleRole () {
let url = process.env.basePath + 'bp_role_query'
let param = {
master: {
......
src/pages/pay/firstPay/first-pay.vue
View file @ ee8afd7e
......@@ -94,7 +94,8 @@ export default {
let vm = this
let url = process.env.basePath + 'initial_payment_query'
let param = {
phone: window.localStorage.getItem('user_phone'),
// phone: window.localStorage.getItem('user_phone'),
bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
}
hlsPopup.showLoading('请稍候')
vm.$post(url, param).then(function (res) {
......
src/pages/userBindNew/np/base-info.vue
View file @ ee8afd7e
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