红包 优化

ghsApp/src/pagesOrder/refund.vue

@@ -36,7 +36,13 @@
 				.list-title{
 					height: 60rpx;
 					padding-bottom: 20rpx;
-
+					.product-name{
+						overflow: hidden;
+						text-overflow:ellipsis;
+						white-space: nowrap;
+						width:310rpx;
+						margin-right:20rpx;
+					}
 				}
 				.list-val{
 					input{
@@ -88,7 +94,7 @@
 			<view class="refund-label">退款方式：</view>
 			<view class="flex list">
 				<view class="flex" @tap="refundType=1" ><view class="flex-center radioBtn" :class="refundType==1?'active':''"></view>退货并退款</view>
-				<view style="margin-left: 20rpx" class="flex" @tap="refundType=2"><view class="flex-center radioBtn"  :class="refundType==1?'':'active'"></view>仅退款</view>
+				<view style="margin-left: 20rpx" class="flex" @tap="refundType=2"><view class="flex-center radioBtn" :class="refundType==1?'':'active'"></view>仅退款</view>
 			</view>
 		</view>
 		<view class="refund-item-list" v-if="refundType==1">
@@ -96,7 +102,7 @@
 			<view>
 				<view class="list" v-for="(res,i) in product" :key="i">
 				<view class="flex list-title" >
-					{{res.name}} {{ `${res.bigNum}/${res.smallNum}` }} {{`￥${res.price}`}}
+					<text class="product-name">{{res.name}}</text> {{ `${parseFloat(res.num)}` }}扎 {{`￥${parseFloat(res.price)}`}}
 				</view>
 				<view class="flex list-val">
 					<input type="number" @blur="inputFun" v-model="res.big"><text>扎</text>
@@ -107,18 +113,18 @@
 		</view>
 		<view class="flex refund-item">
 			<view class="refund-label">订单原价：</view>
-			<view class="list">{{parseFloat(orderInfo.prePrice)||0}}</view>
+			<view class="list">￥{{parseFloat(orderInfo.prePrice)||0}}</view>
 		</view>
 		<view class="flex refund-item" v-if="orderInfo.discountType == 4">
 			<view class="refund-label">红包优惠：</view>
 			<view class="list">
-				<text style="color:red;margin-right:20rpx;">-{{parseFloat(orderInfo.discountAmount) || 0}}</text>
+				<text style="color:red;margin-right:20rpx;">-￥{{parseFloat(orderInfo.discountAmount) || 0}}</text>
 				<text v-if="parseFloat(orderInfo.realPrice) == parseFloat(refundMoney)" style="color:red;">红包将退还客户</text>
 			</view>
 		</view>
 		<view class="flex refund-item">
 			<view class="refund-label">实付金额：</view>
-			<view class="list">{{parseFloat(orderInfo.realPrice)||0}}</view>
+			<view class="list">￥{{parseFloat(orderInfo.realPrice)||0}}</view>
 		</view>
 		<view class="flex refund-item">
 			<view class="refund-label"><text></text>退款金额：</view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -71,7 +71,7 @@
 
         <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: '/pagesPurchase/refundDetail',query: {id: detailInfo.id}})" class="admin-button-com">退款明细</button>
             </view>
@@ -167,9 +167,15 @@
             <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="tui-title"><text v-if="detailInfo.discountType == 4">红包优惠</text><text v-else>优惠</text></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.discountAmount > 0">
+            <div class="tui-title">已付金额</div>
+            <div class="detail-price_box" style="font-size: 28rpx;">¥{{ parseFloat((Number(detailInfo.prePrice) - Number(detailInfo.discountAmount)).toFixed(2)) }}</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;">-¥{{ parseFloat(detailInfo.refundPrice)}}</div>

hdApp/src/pagesPurchase/refundDetail.vue

@@ -15,12 +15,12 @@
                   <text class="item-name">{{ s.name }}</text>
                   <text class="item-price">
                     <text class="unit"></text>
-                    <text class="price"><text>{{s.itemNum}}扎*{{parseFloat(s.itemPrice)}}</text></text>
+                    <text class="price"><text>{{s.itemNum}}扎</text></text>
                   </text>
                 </view>
                 <view class="info-line">
                   <text class="item-type"></text>
-                  <text class="item-count">¥{{ s.totalPrice }}</text>
+                  <text class="item-count"></text>
                 </view>
               </view>
             </view>
@@ -30,22 +30,17 @@
 
 			<view class="content-box price-detail">
 				<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">¥{{ prePrice }}</div>
-					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false" v-if="discountType == 4">
-						<div class="tui-title">红包优惠</div>
-						<div class="detail-price_box red"><text v-if="hbRefund == 1" style="margin-right:50rpx;">红包已退回</text>-¥{{ discountAmount }}</div>
-					</tui-list-cell>
-					<tui-list-cell class="line-cell" :hover="false">
-						<div class="tui-title">实付金额</div>
-						<div class="detail-price_box">¥{{ actPrice }}</div>
-					</tui-list-cell>
+
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">退款金额</div>
-						<div class="detail-price_box red">¥{{ refundPrice }}</div>
+            <div class="detail-price_box red">¥{{ refundPrice }}</div>
+					</tui-list-cell>
+
+					<tui-list-cell class="line-cell" :hover="false" v-if="hbRefund == 1">
+						<div class="tui-title">红包</div>
+            <div class="detail-price_box red">已退回</div>
 					</tui-list-cell>
+
 				</div>
 			</view>
 
@@ -68,6 +63,7 @@
           </tui-list-cell>
         </div>
       </view>
+      <view v-if="refundData.cgInfo.discountType == 4" style="margin-top:30rpx;color:red;font-weight:400;font-size:30rpx;">此单使用红包，红包抵扣部分不能退款。</view>
 
     </view>
   </view>
@@ -114,7 +110,7 @@ export default {
           this.actPrice = parseFloat(res.data.cgInfo.actPrice)
         }
         this.hbRefund = res.data.info.hbRefund
-        this.refundPrice = res.data.info.refundPrice
+        this.refundPrice = parseFloat(res.data.info.refundPrice)
       })
     }
   }