shish пре 10 часа
родитељ
комит
c296c70033

+ 3 - 3
ghsApp/src/admin/home/components/OrderItem.vue

@@ -80,7 +80,7 @@
           <view v-if="item.smallNum > 0">{{ `${item.bigNum}/${item.smallNum}` }}</view>
           <view v-if="item.smallNum > 0">{{ `${item.bigNum}/${item.smallNum}` }}</view>
           <view v-else>{{ item.bigNum }}</view>
           <view v-else>{{ item.bigNum }}</view>
           <view class="price">
           <view class="price">
-            <!-- 列表展示价 = actPrice - 封账退款(nextDayTkPrice),与详情「最终金额」对齐 -->
+            <!-- 列表展示价 = actPrice - 封账退款(nextDayTkPrice),与详情「最终金额」对齐 -->
             <view v-if="Number(item.orderPrice) == displayActPrice">¥{{ displayActPrice }}</view>
             <view v-if="Number(item.orderPrice) == displayActPrice">¥{{ displayActPrice }}</view>
             <view v-else>
             <view v-else>
               <text class="price-original">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</text>
               <text class="price-original">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</text>
@@ -384,8 +384,8 @@ export default {
   },
   },
   computed: {
   computed: {
     /**
     /**
-     * 列表展示价:actPrice - 封账退款(nextDayTkPrice)
-     * 封账退款不改 actPrice,这里扣减后与详情「最终金额」一致
+     * 列表展示价:actPrice - 封账退款(nextDayTkPrice)
+     * 封账退款不改 actPrice,这里扣减后与详情「最终金额」一致
      */
      */
     displayActPrice() {
     displayActPrice() {
       const act = Number(this.item.actPrice) || 0
       const act = Number(this.item.actPrice) || 0

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

@@ -404,9 +404,9 @@
 						<div class="tui-title" style="color:#3385FF;">实际金额</div>
 						<div class="tui-title" style="color:#3385FF;">实际金额</div>
 						<div class="detail-price_box" style="font-size: 34upx;color:#3385FF;">¥{{ parseFloat(detailInfo.realPrice)}}</div>
 						<div class="detail-price_box" style="font-size: 34upx;color:#3385FF;">¥{{ parseFloat(detailInfo.realPrice)}}</div>
 					</tui-list-cell>
 					</tui-list-cell>
-					<!-- 封账退款:不改 realPrice,单独展示;最终金额 = 实际金额 - 封账退款 -->
+					<!-- 封账退款:不改 realPrice,单独展示;最终金额 = 实际金额 - 封账退款 -->
 					<tui-list-cell v-if="Number(detailInfo.nextDayTkPrice) > 0" class="line-cell" :hover="false">
 					<tui-list-cell v-if="Number(detailInfo.nextDayTkPrice) > 0" class="line-cell" :hover="false">
-						<div class="tui-title">封账退款</div>
+						<div class="tui-title">封账退款</div>
 						<div class="detail-price_box" style="font-size: 28upx;">-¥{{ parseFloat(detailInfo.nextDayTkPrice) }}</div>
 						<div class="detail-price_box" style="font-size: 28upx;">-¥{{ parseFloat(detailInfo.nextDayTkPrice) }}</div>
 					</tui-list-cell>
 					</tui-list-cell>
 					<tui-list-cell v-if="Number(detailInfo.nextDayTkPrice) > 0" class="line-cell" :hover="false">
 					<tui-list-cell v-if="Number(detailInfo.nextDayTkPrice) > 0" class="line-cell" :hover="false">
@@ -466,13 +466,13 @@
 						<div class="tui-title">实际金额</div>
 						<div class="tui-title">实际金额</div>
 						<div class="detail-price_box" style="font-size: 32upx;">¥{{ parseFloat(detailInfo.realPrice)}}</div>
 						<div class="detail-price_box" style="font-size: 32upx;">¥{{ parseFloat(detailInfo.realPrice)}}</div>
 					</tui-list-cell>
 					</tui-list-cell>
-					<!-- 封账退款 / 最终金额:与上方价格明细口径一致 -->
+					<!-- 封账退款 / 最终金额:与上方价格明细口径一致 -->
 					<tui-list-cell
 					<tui-list-cell
 						v-if="(detailInfo.status==3 || detailInfo.status==4) && Number(detailInfo.nextDayTkPrice) > 0"
 						v-if="(detailInfo.status==3 || detailInfo.status==4) && Number(detailInfo.nextDayTkPrice) > 0"
 						class="line-cell"
 						class="line-cell"
 						:hover="false"
 						:hover="false"
 					>
 					>
-						<div class="tui-title">封账退款</div>
+						<div class="tui-title">封账退款</div>
 						<div class="detail-price_box" style="font-size: 28upx;">-¥{{ parseFloat(detailInfo.nextDayTkPrice) }}</div>
 						<div class="detail-price_box" style="font-size: 28upx;">-¥{{ parseFloat(detailInfo.nextDayTkPrice) }}</div>
 					</tui-list-cell>
 					</tui-list-cell>
 					<tui-list-cell
 					<tui-list-cell
@@ -828,8 +828,8 @@ export default {
 			return parseFloat((day + next).toFixed(2))
 			return parseFloat((day + next).toFixed(2))
 		},
 		},
 		/**
 		/**
-		 * 最终金额:实际金额 realPrice - 封账退款 nextDayTkPrice
-		 * 封账退款不改实付字段,用差值给店员看净额
+		 * 最终金额:实际金额 realPrice - 封账退款 nextDayTkPrice
+		 * 封账退款不改实付字段,用差值给店员看净额
 		 */
 		 */
 		finalPriceAfterSealRefund() {
 		finalPriceAfterSealRefund() {
 			const real = Number(this.detailInfo.realPrice) || 0
 			const real = Number(this.detailInfo.realPrice) || 0

+ 1 - 1
ghsApp/src/pagesOrder/refundDetail.vue

@@ -76,7 +76,7 @@
 
 
 			<view class="refund-row" v-if="Number(info.sameDay) === 0">
 			<view class="refund-row" v-if="Number(info.sameDay) === 0">
 				<view class="refund-label">退款类型</view>
 				<view class="refund-label">退款类型</view>
-				<view class="refund-value" style="color: #3385ff;">{{ Number(info.sameDay) === 0 ? '封账退款' : '当天退款' }}</view>
+				<view class="refund-value" style="color: #e67e22;">{{ Number(info.sameDay) === 0 ? '封账后退款' : '当天退款' }}</view>
 			</view>
 			</view>
 			<view class="refund-row">
 			<view class="refund-row">
 				<view class="refund-label">原单付款</view>
 				<view class="refund-label">原单付款</view>

+ 1 - 1
ghsApp/src/pagesOrder/refundList.vue

@@ -11,7 +11,7 @@
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
               <!-- sameDay=0 隔天售后,否则当天售后 -->
               <!-- sameDay=0 隔天售后,否则当天售后 -->
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
-                退款:{{ Number(item.sameDay) === 0 ? '封账退款' : '当天退款' }}
+                退款:{{ Number(item.sameDay) === 0 ? '封账退款' : '当天退款' }}
               </text>
               </text>
               <text v-if="!$util.isEmpty(item.remark)">备注:{{item.remark}}</text>
               <text v-if="!$util.isEmpty(item.remark)">备注:{{item.remark}}</text>