采购详情 供货详情页面重新设计修改

canteen/pages/purchase/detail.vue

@@ -2,20 +2,12 @@
 	<view>
 		<block v-if="$isRight(order)">
 			<view class="head">
-				<view class="lf-row-between lf-color-gray list">
-					<view>批次号 {{ order.batch_sn }}</view>
-				</view>
-				<view class="lf-row-between lf-color-gray list">
-					<view>采购单 {{ order.p_sn }}</view>
-				</view>
-				<view class="lf-row-between lf-color-gray list">
-					<view>供应商联系电话 <text class="lf-m-l-10" style="color: rgb(17, 209, 137);" @click="call(order.supplier.ctl_phone)">{{ order.supplier.ctl_phone }}</text> </view>
-				</view>
 				<view class="lf-row-between list">
 					<image :src="order.supplier.logo" class="image"></image>
 					<view class="info">
 						<view class="lf-font-32 lf-color-black lf-font-bold">{{ order.supplier.supplier_name }}</view>
 						<view class="lf-font-24 lf-color-555">{{ order.supplier.address }}</view>
+						<view class="lf-font-24 lf-color-555" @click="call(order.supplier.ctl_phone)">{{order.supplier.ctl_man}} {{ order.supplier.ctl_phone }}</view>
 					</view>
 				</view>
 			</view>
@@ -37,6 +29,14 @@
 					<view>联系电话</view>
 					<view class="lf-font-bold" style="color: rgb(17, 209, 137);">{{order.deliver_phone}}</view>
 				</view>
+				<view class="lf-row-between list">
+					<view>采购单</view>
+					<view class="lf-font-bold">{{ order.p_sn }}</view>
+				</view>
+				<view class="lf-row-between list">
+					<view>批次号</view>
+					<view class="lf-font-bold">{{ order.batch_sn }}</view>
+				</view>
 				<view class="lf-row-between list">
 					<view>收货时间</view>
 					<view class="lf-font-bold">{{order.deadline_text}}</view>
@@ -342,7 +342,7 @@
 		height: auto;
 		.list{
 			padding: 30rpx 0;
-			border-bottom: 1rpx solid #e5e5e5;
+			// border-bottom: 1rpx solid #e5e5e5;
 			font-size: 28rpx;
 			color: #555555;
 			&:last-child{

supplier/pages/gonghuo/detail.vue

@@ -1,32 +1,37 @@
 <template>
 	<view>
 		<view class="head">
-			<view class="lf-row-between lf-color-gray list">
-				<view>采购单 {{ order.p_sn }}</view>
-			</view>
 			<view class="lf-row-between list" v-if="order.canteen">
 				<image :src="order.canteen.logo" class="image"></image>
 				<view class="info">
 					<view class="lf-font-32 lf-color-black lf-font-bold">{{ order.canteen.canteen_name }}</view>
 					<view class="lf-font-24 lf-color-555">{{ order.canteen.address }}</view>
+					<view class="lf-font-24 lf-color-555" @click="call(order.canteen.ctl_phone)">{{order.canteen.ctl_man}} {{ order.canteen.ctl_phone }}</view>
 				</view>
 			</view>
-			<view class="lf-row-between lf-color-gray list">
-				<view>食堂联系电话 <text style="color:#1833F2" @click="call(order.canteen.ctl_phone)" class="lf-m-l-10">{{ order.canteen.ctl_phone }}</text></view>
-			</view>
-			<view class="lf-row-between lf-color-gray list">
-				<view>采购人 {{ order.contact_name }}</view>
-			</view>
-			<view class="lf-row-between lf-color-gray list">
-				<view>采购人联系电话 <text style="color:#1833F2" @click="call(order.contact_phone)" class="lf-m-l-10">{{ order.contact_phone }}</text></view>
-			</view>
 		</view>
 		<self-line></self-line>
 		<view class="lf-border-box lf-bg-white">
 			<lf-stepbar :list="stepList"></lf-stepbar>
 		</view>
-		<self-line v-if="order.car_license || supplier_voucher.length || canteen_voucher.length"></self-line>
+		<self-line v-if="order.car_license || supplier_voucher.length || canteen_voucher.length ||order.contact_name"></self-line>
 		<view class="head">
+			<view class="lf-row-between list">
+				<view>采购人</view>
+				<view class="lf-font-bold">{{order.contact_name}}</view>
+			</view>
+			<view class="lf-row-between list">
+				<view>联系电话</view>
+				<view class="lf-font-bold" @click="call(order.contact_phone)">{{order.contact_phone}}</view>
+			</view>
+			<view class="lf-row-between list">
+				<view>采购单</view>
+				<view class="lf-font-bold">{{order.p_sn}}</view>
+			</view>
+			<view class="lf-row-between list">
+				<view>批次号</view>
+				<view class="lf-font-bold">{{order.batch_sn}}</view>
+			</view>
 			<block v-if="order.car_license">
 				<view class="lf-row-between list">
 					<view>车辆</view>
@@ -359,7 +364,7 @@
 		height: auto;
 		.list{
 			padding: 30rpx 0;
-			border-bottom: 1rpx solid #e5e5e5;
+			// border-bottom: 1rpx solid #e5e5e5;
 			font-size: 28rpx;
 			color: #555555;
 			&:last-child{