shish 3 lat temu
rodzic
commit
d3f00c8f2e
2 zmienionych plików z 25 dodań i 30 usunięć
  1. 11 16
      ghsApp/src/admin/clear/info.vue
  2. 14 14
      ghsApp/src/pagesPurchase/info.vue

+ 11 - 16
ghsApp/src/admin/clear/info.vue

@@ -13,12 +13,7 @@
 					<view>订单编码:</view>
 					<view>{{ detailInfo.orderSn }}</view>
 					<view class="price">
-						<button
-							@click="copy(detailInfo.orderSn)"
-							class="admin-button-com default"
-						>
-							复制
-						</button>
+						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default" > 复制 </button>
 					</view>
 				</view>
 				<view class="order-info_box">
@@ -42,11 +37,14 @@
 									<text class="item-name">{{ s.orderSn }} 时间 {{s.addTime ? s.addTime.substr(5,11):''}}</text>
 									<text class="item-price">
 										<text class="unit">¥</text>
-										<text class="price">{{ s.realPrice }}</text>
+										<text class="price">{{ s.realPrice?parseFloat(s.realPrice):0 }}</text>
 									</text>
 								</view>
 								<view class="info-line">
-									<text class="item-type">{{ `${s.bigNum}/${s.smallNum}` }}</text>
+									<text class="item-type">
+										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
+										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
+									</text>
 									<text class="item-count" style="font-weight:normal;color:#3385FF;font-size:26upx;">查看明细</text>
 								</view>
 							</view>
@@ -64,17 +62,16 @@
 				<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;">¥{{ detailInfo.prePrice }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.prePrice?parseFloat(detailInfo.prePrice):0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.discountAmount > 0">
 						<div class="tui-title">扣除</div>
-						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.discountAmount }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.discountAmount?parseFloat(detailInfo.discountAmount):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.realPrice }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.realPrice?parseFloat(detailInfo.realPrice):0 }}</div>
 					</tui-list-cell>
-
 				</div>
 			</view>
 			<view class="content-box price-detail" v-if="!$util.isEmpty(detailInfo.remark)">
@@ -102,10 +99,7 @@
 					<view> {{ detailInfo.ghsName }} {{ detailInfo.ghsMobile }} </view>
 				</view>
 				<view>
-					<i
-						@click="callUp(detailInfo.ghsMobile)"
-						class="iconfont icondianhua1"
-					></i>
+					<i @click="callUp(detailInfo.ghsMobile)" class="iconfont icondianhua1" ></i>
 				</view>
 			</view>
 
@@ -198,6 +192,7 @@ export default {
 				font-size: 50upx;
 				color: #3385ff;
 				margin-left: 0upx;
+				margin-right:20upx;
 			}
 		}
 	}

+ 14 - 14
ghsApp/src/pagesPurchase/info.vue

@@ -121,15 +121,15 @@
 					</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.packingCharge }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.packingCharge?parseFloat(detailInfo.packingCharge):0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.yfPayWay==1" class="line-cell" :hover="false">
 						<div class="tui-title">短途运费</div>
-						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.shortCharge }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.shortCharge?parseFloat(detailInfo.shortCharge):0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.yfPayWay==1" class="line-cell" :hover="false">
 						<div class="tui-title">长途运费</div>
-						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.longCharge }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.longCharge?parseFloat(detailInfo.longCharge):0 }}</div>
 					</tui-list-cell>
 				</div>
 			</view>
@@ -138,19 +138,19 @@
 				<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: 30upx;">¥{{ detailInfo.prePrice || 0.00 }}</div>
+						<div class="detail-price_box" style="font-size: 30upx;">¥{{ detailInfo.prePrice ? parseFloat(detailInfo.prePrice) : 0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.refundPrice > 0" class="line-cell" :hover="false">
 						<div class="tui-title">退款金额</div>
-						<div class="detail-price_box" style="font-size: 28upx">-¥{{ parseFloat(detailInfo.refundPrice) }}</div>
+						<div class="detail-price_box" style="font-size: 28upx">-¥{{ detailInfo.tkPrice ? parseFloat(detailInfo.tkPrice) : 0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.discountAmount > 0" class="line-cell" :hover="false">
 						<div class="tui-title">减免</div>
-						<div class="detail-price_box" style="font-size: 30upx;">¥{{ detailInfo.discountAmount || 0.00 }}</div>
+						<div class="detail-price_box" style="font-size: 30upx;">¥{{ detailInfo.discountAmount ? parseFloat(detailInfo.discountAmount) : 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: 30upx;">¥{{ detailInfo.realPrice || 0.00 }}</div>
+						<div class="detail-price_box red" style="font-size: 30upx;">¥{{ detailInfo.realPrice ? parseFloat(detailInfo.realPrice) : 0 }}</div>
 					</tui-list-cell>
 				</div>
 			</view>
@@ -168,31 +168,31 @@
 				<div class="module-com input-line-wrap">
 					<tui-list-cell v-if="detailInfo.yfPayWay==2" class="line-cell" :hover="false">
 						<div class="tui-title">短途运费</div>
-						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.shortCharge }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.shortCharge?parseFloat(detailInfo.shortCharge):0 }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.yfPayWay==2" class="line-cell" :hover="false">
 						<div class="tui-title">长途运费</div>
-						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.longCharge }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.longCharge?parseFloat(detailInfo.longCharge):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.pickCharge }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.pickCharge?parseFloat(detailInfo.pickCharge):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.localCharge }}</div>
+						<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.localCharge?parseFloat(detailInfo.localCharge):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: 30upx;">¥{{ detailInfo.totalFreight || 0.00 }}</div>
+						<div class="detail-price_box" style="font-size: 30upx;">¥{{ detailInfo.totalFreight?parseFloat(detailInfo.totalFreight):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: 30upx;">¥{{ detailInfo.totalWeight || 0.00 }}</div>
+						<div class="detail-price_box" style="font-size: 30upx;">¥{{ detailInfo.totalWeight?parseFloat(detailInfo.totalWeight):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: 30upx;">¥{{ detailInfo.avgKgWeight || 0.00 }}</div>
+						<div class="detail-price_box" style="font-size: 30upx;">¥{{ detailInfo.avgKgWeight?parseFloat(detailInfo.avgKgWeight):0 }}</div>
 					</tui-list-cell>
 
 				</div>