Merge branch '1210-v3.0.2' into test

application/app_broker/view/index/timeline_pc.html

@@ -55,25 +55,20 @@
 								<p v-if="item.step_name==='follow_up_log'">对面积的要求：<span>{{item.area_requirement}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">对价格的要求：<span>{{item.price_requirement}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">所在区域：<span>{{item.area_detail+' '+item.business_area}}</span></p>
-								<!--<div v-if="item.step_name==='pay_log'">
+								<div v-if="item.step_name==='pay_log'">
 									<div class="sp-pay-log-div" v-for="(item2, idnex2) in item.list">
 										<p>入账类型：<span>{{switchRzType(item2.type)}}</span></p>
 										<p>支付方式：<span>{{switchPayType(item2.pay_type)}}</span></p>
 										<p>入账金额：<span class="span-active">{{item2.money}}元</span></p>
 									</div>
-								</div>-->
-								<p v-if="item.step_name==='pay_log'">入账类型：<span>{{switchRzType(item.list[0].type)}}</span></p>
-								<p v-if="item.step_name==='pay_log'">支付方式：<span>{{switchPayType(item.list[0].pay_type)}}</span></p>
-								<p v-if="item.step_name==='pay_log'">入账金额：<span class="span-active">{{item.list[0].money}}元</span></p>
+								</div>
+								
 								<p v-if="item.step_name==='pay_log'&&item.list[0].type==10">最后转定时间：<span>{{item.list[0].last_transfer_time}}</span></p>
 								<p v-if="item.step_name==='pay_log'&&item.list[0].type==10">收条编号：<span>{{item.list[0].receipt_number}}</span></p>
 								<p v-if="item.step_name==='pay_log'&&item.list[0].type==30">最后转定时间：<span>{{item.list[0].last_transfer_time}}</span></p>
 								<p v-if="item.step_name==='pay_log'&&item.list[0].type==30">收条编号：<span>{{item.list[0].receipt_number}}</span></p>
 								<p v-if="item.step_name==='pay_log'">入账姓名：<span>{{item.list[0].transfer_name}}</span></p>
 								
-								<p v-if="item.step_name==='pay_log'&&item.list[0].type==91">是否分红：<span>{{item.list[0].is_dividend == 1 ? "否" : "是"}}</span></p>
-								<p v-if="item.step_name==='pay_log'&&item.list[0].type==92">是否分红：<span>{{item.list[0].is_dividend == 1 ? "否" : "是"}}</span></p>
-								
 								<p v-if="item.step_name==='pay_log'">商铺号：<span>{{item.list[0].house_number}}</span></p>
 								<p v-if="item.step_name==='pay_log'">业态/品牌：<span>{{item.list[0].industry_type}}</span></p>
 								<p v-if="item.step_name==='pay_log' && item.list[0].source == 0">来源：<span>APP</span></p>

public/appnew/src/components/download/download.vue

@@ -59,24 +59,21 @@
 </script>
 <style scoped>
 	.min-height-list{
-		width: 100%;
+		width: 7.5rem;
 		height: 100vh;
 		background: #fff;
 	}
 	.bg-con{
 		width: 100%;
 		height: 10rem;
-		background: #fff url(images/Group@2x.png) no-repeat center .3rem/100%;
+		background: #fff url(images/Group@2x.png) no-repeat center .3rem/7.5rem;
 	}
 	img{
 		width: 5.4rem;
-		position: fixed;
-		bottom: 1.2rem;
-		left: 50%;
-       margin-left: -2.7rem;
 	}
 	.btn-con{
-		/*margin-top: .3rem;*/
+		text-align: center;
+		margin-top: .3rem;
 	}
 	
 </style>