Commit e441cf4e authored by 胡's avatar

fix: 12.27

parent 5da5abc8
......@@ -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.3.3"'
currentVersion: '"3.3.6"'
}
......@@ -56,10 +56,12 @@
<button class="sign" @click="sign">签订电子合同</button>
</div>
<button v-show="!tabNum && !isRadio" class="go-radio" @click="isRadio = true">
<img src="@/assets/login/write.png" alt="icon" />
<span>批量签署</span>
</button>
<div class="button-box" v-show="!tabNum && !isRadio">
<div class="go-radio" @click="isRadio = true">
<img src="@/assets/login/write.png" alt="icon" />
<span>批量签署</span>
</div>
</div>
</div>
<div v-if="showList.length === 0">
<div class="display">
......@@ -124,7 +126,7 @@ export default {
this.$router.push({ path: '/batchSign', query: { name: 'confirmList' } });
},
clickRadio(item) {
item.checked = !item.checked;
item.checked = !item.checked;
this.chooseAll = this.showList.every(item => item.checked);
this.$forceUpdate();
......@@ -271,11 +273,21 @@ export default {
align-items: center;
justify-content: center;
.button-box {
width: 100%;
height: 100%;
background: #fff;
display: flex;
align-items: center;
justify-content: center;
}
.go-radio {
width: 90%;
color: #fff;
background-color: #1d3fff;
padding: 7px 10px;
padding: 8px 10px;
border-radius: 5px;
display: flex;
justify-content: center;
......@@ -290,6 +302,7 @@ export default {
.choose {
width: 100%;
display: flex;
background: #fff;
justify-content: space-evenly;
align-items: center;
height: 100%;
......@@ -471,7 +484,7 @@ export default {
#confirmList {
.scrollContent {
padding-top: 3.32rem;
padding-bottom: 1.2rem;
padding-bottom: 1.2rem;
}
}
}
......@@ -480,7 +493,7 @@ export default {
.platform-ios {
#confirmList {
.scrollContent {
padding-top: 3.72rem;
padding-top: 3.72rem;
padding-bottom: 1.2rem;
}
......
......@@ -140,13 +140,13 @@ export default {
.box {
display: flex;
justify-content: space-between;
align-items: center;
width: 99.9%;
height: 60px;
padding: 0 20px 0 10px;
background-color: #fff;
border-radius: 8px;
line-height: 60px;
border-radius: 8px;
font-size: 80%;
color: rgb(58, 58, 58);
margin-bottom: 0.15rem;
......
......@@ -165,7 +165,7 @@ export default {
bp_agent_id: '', // 经销商id
bp_agent_name: '', // 经销商名称
salesInfo: {
bp_type: window.localStorage.bp_type,
bp_type: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type,
bp_id_tenant: '', // 承租人id
business_type: '', // 业务类型
bp_id_agent: '', // 经销商id
......@@ -214,9 +214,9 @@ export default {
vm.inflow_line = '' // 授信总额度
vm.inflow_used = '' // 已使用授信额度
vm.inflow_reset = '' // 剩余授信额度
vm.user_bp_type = window.localStorage.bp_type
vm.user_bp_type = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type;
// vm.sales = window.localStorage.bp_name
vm.multiple = window.localStorage.multipleRole
vm.multiple = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type;
// {
// "bp_id_tenant":"8964",
// "business_type":"LEASEBACK",
......@@ -262,7 +262,7 @@ export default {
factory: '', // 主机厂id
manu_manager: '', // 办事处业务员
sale_date: '',
bp_type: window.localStorage.bp_type,
bp_type: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type,
project_id: '',
}
vm.businessQuery().then(res => {
......@@ -353,10 +353,10 @@ export default {
return vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
console.log('经销商', res)
if (res.result === 'S') {
if (res.result === 'S' && res.info) {
vm.bp_agent_name = res.info.bp_agent_name
vm.bp_agent_id = res.info.bp_agent_id
if (window.localStorage.bp_type === 'OFFICE') {
if (JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type === 'OFFICE') {
vm.office_name = res.info.bp_agent_name
vm.salesInfo.office_id = res.info.bp_agent_id
vm.salesInfo.bp_id_agent = ''
......
......@@ -115,9 +115,9 @@
<div slot="content">{{ detailInfo.product_num }}</div>
</item>
</list-item>
<div class="header">设备清单</div>
</div>
<scroll ref="scroll" :updateData="[lists]" :pullUp="true" @pullingUp="getEquipment">
<div class="header">设备清单</div>
<list-item :item-height="104" class="equipment-list">
<item v-for="(item,index) in lists" :proportion="[2, 1]" :key="index">
<div slot="name" class="parameters">
......@@ -144,7 +144,7 @@
:class="['status', 'red']"
>逾期{{ item.overdue_times }}</span>
<div class="plan" @click="toRepayPlan(item.contract_id)">
<img src="@/assets/contractRepayment/plan.png" />
<img src="@/assets/contractRepayment/plan.png" />
<span>还款计划</span>
</div>
</div>
......@@ -420,7 +420,51 @@ export default {
}
}
.scrollContent {
padding-bottom: 20px;
// padding-bottom: 20px;
.header {
//position: relative;
background-color: #fafafa;
height: 40px;
line-height: 40px;
font-size: 14px;
color: #1d3fff;
text-indent: 1em;
border-bottom: 1px solid #f1f0f5;
.download {
position: absolute;
padding-left: 12px;
right: 12px;
top: 8px;
background: #ffffff;
border-radius: 5px;
height: 24px;
line-height: 24px;
// width: 93px;
font-family: PingFangSC-Regular;
font-size: 11px;
color: #1d3fff;
letter-spacing: 0.34px;
img {
position: absolute;
height: 15px;
left: 6px;
top: 6px;
}
}
&:before {
content: "";
position: absolute;
top: 12px;
left: 0;
width: 4px;
height: 16px;
background: #1d3fff;
}
}
}
.tab-style {
width: 100%;
......
......@@ -83,10 +83,12 @@
<button class="sign" @click="signContract">签订征信授权书</button>
</div>
<button v-show="num == 1 && !isRadio" class="go-radio" @click="isRadio = true">
<img src="@/assets/login/write.png" alt="icon" />
<span>批量签署</span>
</button>
<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">
......@@ -501,11 +503,20 @@ export default {
align-items: center;
justify-content: center;
.go-radio {
.button-box {
width: 100%;
height: 100%;
background: #fff;
display: flex;
align-items: center;
justify-content: center;
}
.go-radio {
width: 90%;
color: #fff;
background-color: #1d3fff;
padding: 7px 10px;
padding: 8px 10px;
border-radius: 5px;
display: flex;
justify-content: center;
......@@ -520,6 +531,7 @@ export default {
.choose {
width: 100%;
display: flex;
background-color: #fff;
justify-content: space-evenly;
align-items: center;
height: 100%;
......
......@@ -159,7 +159,7 @@ export default {
beforeRouteEnter (to, from, next) {
// if (true) {
next(vm => {
if (window.localStorage.getItem('user_phone')) {
if (window.localStorage.getItem('user_phone')) {
vm.userQuery()
}
})
......@@ -234,7 +234,10 @@ export default {
// }
// })
let obj = JSON.parse(window.localStorage.getItem("now_user_bp_bind_id"));
let obj = JSON.parse(window.localStorage.getItem("now_user_bp_bind_id"));
if(!Object.keys(obj).length) return vm.role = '未绑定';
let user_bp_status = obj.bp_status;
let user_bp_class = obj.bp_class;
let bp_id = obj.bp_id;
......
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