Merge branch 'wjw_ins_upadte'

pages/checkstand/checkstand.vue

@@ -87,7 +87,7 @@
 			}
 		},
 		onLoad(options){
-			this.contract_no = options.contract_no;
+			this.contract_no = options.contract_no || '';
 			this.loadData();
 			this.isWx = isWeixin();
 		},

pages/financial/financialstage.vue

@@ -60,13 +60,13 @@
 						<i class="fin_rec_label fin_rec_label1">限时</i>
 						<i class="fin_rec_label fin_rec_label2">免息</i>
 					</text>
-					<text v-else style="height: 52rpx;"></text>
+					<view v-else style="height: 52rpx;"></view>
 					<text class="fin_rec_goodsname">{{val.equipment_name}}</text>
 					<!-- <text class="fin_rec_goodssubname">限量版宝璐天然粮</text> -->
 					<text class="fin_rec_goodprice">
 						<text v-if="isLogin">￥</text>{{isLogin ? val.equipment_price : '登录显示价格'}}
 					</text>
-					<text class="fin_rec_goodssubname">{{val.periods_num}}期免息</text>
+					<text class="fin_rec_goodssubname" v-if="Number(val.count) === 0">{{val.periods_num}}期免息</text>
 				</view>
 			</view>
 		</view>

pages/installment/installmentinfo.vue

@@ -65,12 +65,14 @@
 						<view>定金 (元)</view>
 						<view>第1期还款</view>
 						<view>剩余每期还款</view>
+						<view>利率</view>
 					</view>
 					<view class="table_item" v-for="(val, index) in data.Equipmentproperty" :key="index">
 						<view>{{Number(val.periods_num)+1}}期</view>
 						<view>{{val.advance_payment}}</view>
 						<view>{{val.first_payment}}</view>
 						<view>{{val.remaining_payment}}</view>
+						<view>{{val.count*100}}%</view>
 					</view>
 				</view>
 			</view>
@@ -150,6 +152,7 @@
 							<text>¥ {{e_info.remaining_payment}}</text>
 						</view>
 					</view>
+					<view class="profile">利息每期(元)：¥{{(Number(e_info.equipment_price)-Number(e_info.advance_payment))*Number(e_info.count)}}</view>
 				</view>
 				<view class="poupp_tips">金融分期需要上传金融资质, 包含法人信息/企业执照/银行流水等…</view>
 				<view class="poupp_btn" @click="buy_now()">立即分期</view>
@@ -925,6 +928,13 @@
 			font-size: 28rpx;
 			margin: 20rpx auto 0;
 		}
+		.profile {
+			color: #BDBDBD;
+			font-size: 26rpx;
+			height: 36rpx;
+			line-height: 36rpx;
+			margin-top: 24rpx;
+		}
 	}
 	.no_data {
 		font-size: 32rpx;