shish 4 лет назад
Родитель
Сommit
7e03cda8ba

+ 6 - 6
ghsApp/src/pagesOrder/detail.vue

@@ -65,7 +65,7 @@
 				</view>
 				<view v-if="detailInfo.refund == 2" class="order-info_box">
 					<view>退款金额:</view>
-					<view style="color:red;font-weight:bold;font-size:30rpx;">{{detailInfo.tkPrice}}</view>
+					<view style="color:red;font-weight:bold;font-size:30rpx;">{{parseFloat(detailInfo.tkPrice)}}</view>
 					<view class="price" v-if="detailInfo.refund==2">
 						<button @click="pageTo({url: '/pagesOrder/refundMsg',query: {orderSn: detailInfo.orderSn}})" class="admin-button-com">退款明细</button>
 					</view>
@@ -153,23 +153,23 @@
 				<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>
-						<div class="detail-price_box" style="font-size: 28rpx">¥{{ detailInfo.sendCost }}</div>
+						<div class="detail-price_box" style="font-size: 28rpx">¥{{ parseFloat(detailInfo.sendCost) }}</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: 28rpx;">¥{{ detailInfo.prePrice}}</div>
+						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ parseFloat(detailInfo.prePrice)}}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.discountAmount > 0" class="line-cell" :hover="false">
 						<div class="tui-title"><text v-if="detailInfo.discountType == 4">红包</text><text v-else>优惠</text></div>
-						<div class="detail-price_box red" style="font-size: 28rpx">-¥{{ detailInfo.discountAmount }}</div>
+						<div class="detail-price_box red" style="font-size: 28rpx">-¥{{ parseFloat(detailInfo.discountAmount) }}</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 red" style="font-size: 28rpx">-¥{{ detailInfo.refundPrice }}</div>
+						<div class="detail-price_box red" style="font-size: 28rpx">-¥{{ parseFloat(detailInfo.refundPrice) }}</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: 32rpx;">¥{{ detailInfo.realPrice}}</div>
+						<div class="detail-price_box" style="font-size: 32rpx;">¥{{ parseFloat(detailInfo.realPrice)}}</div>
 					</tui-list-cell>
 				</div>
 			</view>

+ 1 - 1
hdApp/src/admin/coupon/selectCouponList.vue

@@ -89,7 +89,7 @@ export default {
     couponChange(item, index) {
       this.couponSelInx = this.couponSelInx == index ? null : index;
       this.hbId = this.couponSelInx == index ? item.id : 0;
-      this.couponAmount = this.couponSelInx == index ? item.amount : '0';
+      this.couponAmount = this.couponSelInx == index ? parseFloat(item.amount) : '0';
     },
     ConfirmReachFn() {
       let obj = {couponAmount:this.couponAmount,hbId:this.hbId,couponSelInx:this.couponSelInx}

+ 7 - 7
hdApp/src/pagesPurchase/purDetails.vue

@@ -88,7 +88,7 @@
           <view>欠款状态:</view>
             <view>是</view>
             <view class="price">
-              <!-- <text v-if="detailInfo.debtAmount > 0" @click="goToSettle(detailInfo)" style="margin-right:38rpx;color:#3385FF;font-size:26rpx;">全部欠款</text> -->
+              <text v-if="detailInfo.debtAmount > 0" @click="goToSettle(detailInfo)" style="margin-right:38rpx;color:#3385FF;font-size:26rpx;">全部欠款</text>
               <button @click="settleOrder(detailInfo.id,detailInfo.supplierId)" class="admin-button-com">结帐</button>
             </view>
         </view>
@@ -160,23 +160,23 @@
         <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>
-            <div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.sendCost }}</div>
+            <div class="detail-price_box" style="font-size: 28rpx;">¥{{ parseFloat(detailInfo.sendCost) }}</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: 28rpx;">¥{{ detailInfo.prePrice }}</div>
+            <div class="detail-price_box" style="font-size: 28rpx;">¥{{ parseFloat(detailInfo.prePrice) }}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.discountAmount > 0">
             <div class="tui-title"><text v-if="detailInfo.discountType == 4">红包</text><text v-else>优惠</text></div>
-            <div class="detail-price_box red" style="font-size: 28rpx;">-¥{{ detailInfo.discountAmount}}</div>
+            <div class="detail-price_box red" style="font-size: 28rpx;">-¥{{ parseFloat(detailInfo.discountAmount)}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.refundPrice > 0">
             <div class="tui-title">退款金额</div>
-            <div class="detail-price_box red" style="font-size: 28rpx;">-¥{{ detailInfo.refundPrice}}</div>
+            <div class="detail-price_box red" style="font-size: 28rpx;">-¥{{ parseFloat(detailInfo.refundPrice)}}</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: 36rpx;">¥{{ detailInfo.realPrice}}</div>
+            <div class="detail-price_box" style="font-size: 28rpx;">¥{{ parseFloat(detailInfo.realPrice)}}</div>
           </tui-list-cell>
         </div>
       </view>
@@ -461,7 +461,7 @@ export default {
         font-size: 24px;
         .price {
           font-weight: bold;
-          font-size: 36px;
+          font-size: 30px;
         }
       }
     }