Merge branch 'ttxh' of http://git.huaml.com/zhh/front-end into ttxh

ghsApp/src/pagesOrder/detail.vue

@@ -155,7 +155,8 @@
 					</tui-list-cell>
 				</div>
 			</view>
-			<view class="content-box price-detail">
+
+			<view class="content-box price-detail" v-if="detailInfo.book == 0">
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" v-if="detailInfo.sendCost > 0" :hover="false">
 						<div class="tui-title">运费</div>
@@ -179,6 +180,37 @@
 					</tui-list-cell>
 				</div>
 			</view>
+
+			<view class="content-box price-detail" v-else>
+				<div class="module-com input-line-wrap">
+				<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">重量（公斤）</div>
+					<div class="detail-price_box" style="font-size: 28upx;">
+					<text v-if="Number(detailInfo.miniKilo) > Number(detailInfo.weight)" style="color:#CCCCCC;margin-right:15upx;">未达{{parseFloat(detailInfo.miniKilo)}}公斤按{{parseFloat(detailInfo.miniKilo)}}公斤计算</text>
+					<text>{{ detailInfo.weight ? parseFloat(detailInfo.weight) : 0 }}</text>
+					</div>
+				</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">每公斤服务费</div>
+					<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.kiloFee ? parseFloat(detailInfo.kiloFee) : 0}}</div>
+				</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">服务费合计</div>
+					<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.allKiloFee ? parseFloat(detailInfo.allKiloFee) : 0}}</div>
+				</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">商品金额</div>
+					<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.itemPrice ? parseFloat(detailInfo.itemPrice) : 0 }}</div>
+				</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">预付金额</div>
+					<div class="detail-price_box red" style="font-size: 28upx;">¥{{ detailInfo.bookPrice ? parseFloat(detailInfo.bookPrice) : 0}}</div>
+				</tui-list-cell>
+				</div>
+			</view>
+
+		
+
 		</view>
 		<div class="app-footer">
 			<template v-for="s in detailInfo.buttonList">
@@ -675,7 +707,7 @@ export default {
 				font-size: 24upx;
 				.price {
 					font-weight: bold;
-					font-size: 36upx;
+					font-size: 28upx;
 				}
 			}
 		}

hdApp/src/pagesPurchase/purDetails.vue

@@ -162,7 +162,7 @@
           </tui-list-cell>
         </div>
       </view>
-      <view class="content-box price-detail">
+      <view class="content-box price-detail" v-if="detailInfo.book == 0">
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :hover="false" v-if="Number(detailInfo.sendCost)>0">
             <div class="tui-title">运费</div>
@@ -187,6 +187,34 @@
         </div>
       </view>
 
+      <view class="content-box price-detail" v-else>
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">重量（公斤）</div>
+            <div class="detail-price_box" style="font-size: 28upx;">
+              <text v-if="Number(detailInfo.miniKilo) > Number(detailInfo.weight)" style="color:#CCCCCC;margin-right:15upx;">未达{{parseFloat(detailInfo.miniKilo)}}公斤按{{parseFloat(detailInfo.miniKilo)}}公斤计算</text>
+              <text>{{ detailInfo.weight ? parseFloat(detailInfo.weight) : 0 }}</text>
+             </div>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">每公斤服务费</div>
+            <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.kiloFee ? parseFloat(detailInfo.kiloFee) : 0}}</div>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">服务费合计</div>
+            <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.allKiloFee ? parseFloat(detailInfo.allKiloFee) : 0}}</div>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">商品金额</div>
+            <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.itemPrice ? parseFloat(detailInfo.itemPrice) : 0 }}</div>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">预付金额</div>
+            <div class="detail-price_box red" style="font-size: 28upx;">¥{{ detailInfo.bookPrice ? parseFloat(detailInfo.bookPrice) : 0}}</div>
+          </tui-list-cell>
+        </div>
+      </view>
+
     </view>
     <view class="footer_bar" v-if="detailInfo.status == 1">
       <view @click="toPay">付款</view>