shish 5 سال پیش
والد
کامیت
a56cc6dc1c
3فایلهای تغییر یافته به همراه11 افزوده شده و 3 حذف شده
  1. 1 1
      ghsApp/src/admin/home/order.vue
  2. 8 0
      ghsApp/src/pagesOrder/detail.vue
  3. 2 2
      ghsApp/src/pagesOrder/refund.vue

+ 1 - 1
ghsApp/src/admin/home/order.vue

@@ -73,7 +73,7 @@
             </view>
             </view>
             <view class="order-info_box">
             <view class="order-info_box">
               <view>数量:</view>
               <view>数量:</view>
-              <view>{{ `${item.bigNum}/${item.smallNum}` }}</view>
+              <view>{{ `${item.bigNum}/${item.smallNum}` }}<text v-if="item.refund == 2" style="color:red;font-weight:bold;margin-left:30rpx;">有退款</text></view>
               <view class="price">
               <view class="price">
                 <view>¥{{ item.actPrice }}</view>
                 <view>¥{{ item.actPrice }}</view>
                 <i class="iconfont iconxiangyou"></i>
                 <i class="iconfont iconxiangyou"></i>

+ 8 - 0
ghsApp/src/pagesOrder/detail.vue

@@ -78,6 +78,14 @@
 					<view>订单状态:</view>
 					<view>订单状态:</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
 				</view>
+				<view v-if="detailInfo.refund == 2" class="order-info_box">
+					<view>有退款:</view>
+					<view style="color:red;font-weight:bold;font-size:30rpx;">是</view>
+				</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>
 
 
 			</view>
 			</view>
 			<view class="content-box shipping-address" v-if="detailInfo.expressProgress!=''">
 			<view class="content-box shipping-address" v-if="detailInfo.expressProgress!=''">

+ 2 - 2
ghsApp/src/pagesOrder/refund.vue

@@ -21,7 +21,6 @@
 					background: #3385ff;
 					background: #3385ff;
 					border-radius: 50%;
 					border-radius: 50%;
 				}
 				}
-
 			}
 			}
 		}
 		}
 		.refund-item-list{
 		.refund-item-list{
@@ -252,8 +251,9 @@ export default {
 				id: this.option.id
 				id: this.option.id
 			});
 			});
 
 
+			this.totalMoney = res.data.actPrice
+
 			this.product = res.data.product.map(ele=>{
 			this.product = res.data.product.map(ele=>{
-				this.totalMoney = (Number(this.totalMoney) + Number(ele.price)).toFixed(2)
 				return {...ele,isActive:false,big:null,small:null}
 				return {...ele,isActive:false,big:null,small:null}
 			})
 			})
 			console.log(this.product)
 			console.log(this.product)