tao

pagesA/enquiry/Enquiry.vue

@@ -21,10 +21,10 @@
 				<view class="padding_box">
 					<view class="item_company">售电公司: <text v-if="i.ename==''||i.ename==null">无</text><text
 							v-else>{{i.ename}}</text></view>
-					<view class="item_conclude_price" v-if="i.contractSpread!=''||i.contractSpread!=null">意向差价: <text v-if="i.contractSpread==''">无</text><text
+					<view class="item_conclude_price" v-if="i.contractSpread!=''&&i.contractSpread!=null">意向差价: <text v-if="i.contractSpread==''">无</text><text
 							v-else>{{i.contractSpread}}厘</text></view>
-					<view class="item_between_price" v-if="i.shareRatio!=''||i.shareRatio!=null">意向分成比例（%）: <text
-							v-if="i.intermediateSpread==''">无</text><text v-else>{{i.intermediateSpread}}%</text></view>
+					<view class="item_between_price" v-if="i.shareRatio!=''&&i.shareRatio!=null">意向分成比例（%）: <text
+							v-if="i.intermediateSpread==''">无</text><text v-else>{{i.shareRatio}}%</text></view>
 					<view class="item_between_price" v-if="type==2">居间差价: <text
 							v-if="i.intermediateSpread==''">无</text><text v-else>{{i.intermediateSpread}}厘</text></view>
 					<view class="item_status" v-if="i.status==1||i.status==9||i.status==11||i.status==13">审核中</view>

pagesA/enquiry/Particulars.vue

@@ -7,10 +7,15 @@
 				基本信息
 			</view>
 			<view class="basic_info common_box">
-				<view>意向价差: {{messages.contractSpread}}</view>
+				<view v-if="messages.contractSpread!=null">意向价差: {{messages.contractSpread}}</view>
+				<view v-if="messages.shareRatio!=null">意向分成比例（%）: {{messages.shareRatio}}</view>
 				<view v-if="userType!=5">居间价差: {{messages.intermediateSpread}}</view>
 				<view>用电年份: {{messages.year}}</view>
-				<view>企业电费通知单: <image :src="messages.enterpriseElectricityNoticeBill" mode="" @click="previewImage(messages.enterpriseElectricityNoticeBill)"></image></view>
+				<view class="df_block">企业电费通知单:
+					<view class="dftzd_img" style="height: auto;">
+						<image v-for="(i,index) in messages.enterpriseElectricityNoticeBill" :key="index" :src="i" mode="" @click="previewImage(i)"></image>
+					</view>
+				</view>
 				<view>备注: {{messages.remark}}</view>
 			</view>
 		</view>
@@ -118,6 +123,7 @@
 			}).then(res=>{
 				if(res.code==200){
 					that.messages=res.data
+					that.messages.enterpriseElectricityNoticeBill=JSON.parse(that.messages.enterpriseElectricityNoticeBill)
 				}
 			})
 		},
@@ -179,10 +185,12 @@
 			background-color: #f4f5f7;
 
 			view {
-				height: 60rpx;
+				min-height: 60rpx;
 				line-height: 60rpx;
 				font-size: 28rpx;
 				color: #333;
+				display: flex;
+				flex-direction: row;
 				text {
 					color: #1989fa;
 				}
@@ -194,7 +202,19 @@
 					margin-left: 20rpx;
 				}
 			}
-
+			.df_block{
+				.dftzd_img{
+					display: flex;
+					flex-direction: row;
+					flex-wrap: wrap;
+					width: 60%;
+					image{
+						margin-right: 10rpx;
+						margin-left: 0;
+						margin-bottom: 10rpx;
+					}
+				}
+			}
 		}
 
 	}