Merge branch 'wjw_fenqi' into develop

pages/apply/applypage1.vue

@@ -283,13 +283,14 @@
 					success: (res) => {
 						this.submitFlag = true;
 						if(res.data.code === 0) {
+							this.qualification_id = res.data.data.qualification_id;
 							uni.setStorage({
 								key: 'installment',
 								data: {
 									...this.data,
 									qualification_id: res.data.data.qualification_id
 								},
-								success: () => {
+								success: (res) => {
 									uni.navigateTo({
 										url: `/pages/apply/applypage2?contract_no=${this.contract_no}`
 									});
@@ -299,7 +300,7 @@
 							uni.hideToast();
 							uni.showToast({
 								icon: 'none',
-								title: res.message
+								title: res.data.message
 							})
 						}
 					}

pages/apply/applypage2.vue

@@ -55,7 +55,7 @@
 				<view class="apply_desc">支持（zip/rar）格式</view>
 			</view>
 			<view class="apply_data_item">
-				<view class="apply_upload" v-if="!params.legal_card_record">
+				<view class="apply_upload" v-if="!params.legal_card_record" ref="compress">
 					<text class="eosfont icons">&#xe60d;</text>
 					<text class="upload_font">法人半年银行流水</text>
 				</view>
@@ -249,7 +249,7 @@
 							uni.hideToast();
 							uni.showToast({
 								icon: 'none',
-								title: '提交失败请重试'
+								title: res.data.message
 							})
 						}
 					}

pages/apply/applypage3.vue

@@ -139,7 +139,7 @@
 							uni.hideToast();
 							uni.showToast({
 								icon: 'none',
-								title: '提交失败请重试'
+								title: res.data.message
 							})
 						}
 					}

pages/financial/financialstage.vue

@@ -105,7 +105,6 @@
 						} else {
 							this.EquipmentHotList = res.data.data.EquipmentHotList;
 						}
-						console.log(this.EquipmentHotList[0].length > 3)
 						if(this.EquipmentHotList[0].length > 3) {
 							this.height = true;
 						}

pages/installment/installmentinfo.vue

@@ -88,15 +88,16 @@
 			<text class="focus_shop" v-if="data.EquipmentInfo.collect_store === 1" @click="collectShop(data.StoreInfo.store_id, 0)">已关注</text>
 		</view>
 		<view class="shop_goods">
-			<view class="shop_goods_item" v-for="(val, index) in data.EquipmentList" :key="index">
+			<view class="shop_goods_item" v-for="(val, index) in data.EquipmentList" :key="index" @click="jumpDetail(val.equipment_id)">
 				<image :src="val.img_url"></image>
 				<view class="shop_goods_name">{{val.equipment_name}}</view>
 				<view class="shop_goods_price"><text v-if="isLogin">¥</text>{{isLogin ? val.equipment_price : '登录显示价格'}}</view>
 			</view>
 		</view>
-		<view class="equipment_detail" v-if="equipment_detail">
+		<view class="equipment_detail">
 			<view class="title_label">产品信息</view>
-			<view v-html="equipment_detail"></view>
+			<view v-if="equipment_detail" v-html="equipment_detail"></view>
+			<view v-if="!equipment_detail" class="no_data">暂无产品信息</view>
 		</view>
 		<view class="goods_info_bottom_bar">
 			<view class="bottom_bar_tool">
@@ -219,7 +220,7 @@
 							...this.e_info,
 							...res.data.data.Equipmentproperty[0]
 						}
-						this.equipment_detail = this.equipment_detail ? res.data.data.EquipmentInfo.equipment_details.replace(/\<img/g, `<image style="max-width: 100%;width: auto !important;height: auto !important"`) : '';
+						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;
 						this.is_auth = res.data.data.is_auth;
@@ -296,7 +297,12 @@
 						}
 					}
 				})
-			}
+			},
+			jumpDetail(id) {
+				uni.navigateTo({
+					url: `/pages/installment/installmentinfo?id=${id}`,
+				});
+			},
 		},
 		components: {
 			uniPopup,
@@ -585,13 +591,18 @@
 			display: block;
 		}
 	}
+	.shop_goods::-webkit-scrollbar {
+		display: none;
+	}
 	.shop_goods {
 		display: flex;
-		justify-content: space-between;
+		justify-content: flex-start;
 		padding: 40rpx 24rpx 24rpx;
 		background: #FFFFFF;
+		overflow: scroll;
 		.shop_goods_item {
 			width: 160rpx;
+			margin-right: 20rpx;
 			image {
 				width: 120rpx;
 				height: 120rpx;
@@ -621,6 +632,9 @@
 				text-align: center;
 			}
 		}
+		.shop_goods_item:last-child {
+			margin-right: 0;
+		}
 	}
 	.goods_info_bottom_bar {
 		width: 100%;
@@ -825,7 +839,8 @@
 			margin: 20rpx auto 0;
 		}
 	}
-	.equipment_detail p image {
-		
+	.no_data {
+		font-size: 32rpx;
+		padding: 24rpx;
 	}
 </style>