代码更新

pagesOrder/detail/components/list.vue

@@ -55,7 +55,7 @@
 										</view>
 										<view class="u-m-r-20 u-font-24 u-flex" v-if="item.returnAmount">
 											<view class="color-666">退款金额:</view>
-											<view class="color-999 u-m-l-6">{{item.returnAmount*item.refundNum}}</view>
+											<view class="color-999 u-m-l-6">{{item.unitPrice*item.refundNum}}</view>
 										</view>
 										<view class="u-m-r-20 u-font-24 u-flex" v-if="item.returnNum">
 											<view class="color-666">退菜数量:</view>
@@ -71,7 +71,7 @@
 								</view>
 								<view class="u-text-right u-m-t-28">
 									<template v-if="item.refundNum>0">
-										<view>￥{{(returnTotalMoney(item)-item.refundNum*item.returnAmount).toFixed(2)}}</view>
+										<view>￥{{(returnTotalMoney(item)-item.refundNum*item.unitPrice).toFixed(2)}}</view>
 										<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
 									</template>
 									<template v-else-if="item.userCouponId">
@@ -177,7 +177,7 @@
 				<template v-if="orderInfo.status=='unpaid'">
 					<view>
 						<text>总计￥</text>
-						<text class="font-bold u-font-32">{{orderInfo.orderAmount.toFixed(2)}}</text>
+						<text class="font-bold u-font-32">{{orderInfo.originAmount.toFixed(2)}}</text>
 					</view>
 				</template>
 				<template v-else>
@@ -523,7 +523,7 @@
 			return props.orderInfo.productCouponDiscountAmount
 		}
 		const goodsPrice = props.data.reduce((a, b) => {
-			const curTotal = b.info.filter(v => v.gift != true && v.userCouponId).reduce((prve,
+			const curTotal = b.info.filter(v => !v.isGift && v.userCouponId).reduce((prve,
 				cur) => {
 				const isVip = props.user.isVip && cur.isMember
 				const memberPrice = cur.memberPrice ? cur.memberPrice : cur.price
@@ -540,6 +540,7 @@
 	 * 已优惠金额
 	 */
 	const youhuiAllPrice = computed(() => {
+		console.log(productCoupPrice)
 		const n = props.orderInfo.originAmount - props.orderInfo.orderAmount + vipDiscountPrice.value * 1
 		return (n < 0 ? 0 : n).toFixed(2)
 	})

pagesOrder/detail/detail.vue

@@ -55,10 +55,10 @@
 	import {hasPermission} from '@/commons/utils/hasPermission.js'
 	
 	import OrderDetail from './page.js'
-	import { getHistoryOrder, refundOrder,getOrderById,printOrder } from '@/api/order.js'
-	import { shopStaffDetail } from '@/api/staff.js'
-	import { shopUserDetail } from '@/api/shopUser.js'
-	import { getShopInfo } from '@/api/shop.js'
+	import { getHistoryOrder, refundOrder,getOrderById,printOrder } from '@/http/api/order.js'
+	import { shopStaffDetail } from '@/http/api/staff.js'
+	import { shopUserDetail } from '@/http/api/shopUser.js'
+	import { getShopInfo } from '@/http/api/shop.js'
 	
 	const tuicai = reactive({
 		show: false,
@@ -100,6 +100,7 @@
 	function getShopInfoData () {
 		getShopInfo({id:uni.getStorageSync('shopInfo').id}).then(res=>{
 			pageData.shopInfo = res;
+			uni.setStorageSync('shopInfo',res)
 		})
 	}