Commit 7871ffca authored by 郑秀明's avatar 郑秀明

Merge branch 'develop'

parents b1e5ea2c 6971e853
......@@ -175,12 +175,12 @@
data: this.params,
method: 'POST',
success: (res) => {
this.submitFlag = true;
if(res.data.code === 0) {
uni.navigateTo({
url: '/pages/apply/choosetype'
});
} else {
this.submitFlag = true;
uni.hideToast();
uni.showToast({
icon: 'none',
......
......@@ -279,7 +279,7 @@
line-height: 76rpx;
border-radius: 16rpx;
background-color: #FFCD00;
margin: 206rpx auto 22rpx;
margin: 100rpx auto 22rpx;
color: #212121;
font-size: 28rpx;
text-align: center;
......
......@@ -215,10 +215,15 @@
...this.data,
...res.data.data
}
res.data.data.Equipmentproperty.forEach((item, index) => {
if(item.is_def == 1) {
this.e_info = {
...this.e_info,
...res.data.data.Equipmentproperty[0]
...item
}
this.periodTab = index
}
});
this.equipment_detail = res.data.data.EquipmentInfo.equipment_details ? res.data.data.EquipmentInfo.equipment_details.replace(/\<img/g, `<image style="max-width: 100%;width: auto !important;height: auto !important"`) : '';
this.isLogin = res.data.login_flg;
this.contract_no = res.data.data.contract_no;
......
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