From bea13c3ba012d6934a8bcb8c964883330da5e9e6 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Tue, 29 Jun 2021 14:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 colorui/main.css              |  6 ++++++
 pages/order/apply-details.vue | 11 ++++++-----
 pages/order/apply-refund.vue  | 11 ++++++-----
 pages/order/confirm-order.vue | 16 ++++++++--------
 pages/order/index.vue         |  7 ++++---
 pages/order/order-details.vue | 12 ++++++++----
 pages/order/unpay-details.vue |  5 +++--
 7 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/colorui/main.css b/colorui/main.css
index 5ffe9e5..786d9ef 100644
--- a/colorui/main.css
+++ b/colorui/main.css
@@ -3887,6 +3887,12 @@ scroll-view.cu-steps .cu-item {
 	color: #FF0000;
 }
 
+.text-price1::before {
+	content: "¥";
+	font-size: 28rpx!important;
+	margin-right: 4rpx;
+}
+
 .text-cut {
 	text-overflow: ellipsis;
 	white-space: nowrap;
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 5369043..80afb84 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -14,9 +14,10 @@
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.order.number}}</text>
 							
 							<view class="flex justify-between" style="margin-top: 28rpx;">
-								<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
+								<lf-price :price="orderDetails.order.selling_price" style="margin-top: 8rpx;" /> 
+								<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
 									{{orderDetails.order.selling_price}}
-								</view>
+								</view> -->
 								<view>
 									<button class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">等待审核</button>
 								</view>
@@ -31,7 +32,7 @@
 				<view class="bg-white">
 					<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
 						<text class="text-gray lf-font-32">订单金额</text>
-						<view class="text-price lf-font-32 text-black">
+						<view class="text-price1 lf-font-32 text-black">
 							{{orderDetails.order.amount}}
 						</view>
 					</view>
@@ -43,7 +44,7 @@
 					</view>
 					<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
 						<text class="text-gray lf-font-32">扣费金额</text>
-						<view class="text-price lf-font-32 text-black">
+						<view class="text-price1 lf-font-32 text-black">
 							{{orderDetails.refund_rate_amount}}
 						</view>
 					</view>
@@ -54,7 +55,7 @@
 				<view class="bg-white">
 					<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
 						<text class="text-gray lf-font-32">可退金额</text>
-						<view class="text-price lf-font-32 text-black">
+						<view class="text-price1 lf-font-32 text-black">
 							{{orderDetails.refund_amount}}
 						</view>
 					</view>
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index 9c40515..0e6040e 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -14,9 +14,10 @@
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{applyDetails.order.number}}</text>
 							
 							<view class="flex justify-between" style="margin-top: 44rpx;">
-								<view class="text-red text-price lf-font-42 lf-font-bold">
+								<lf-price :price="applyDetails.order.selling_price" /> 
+								<!-- <view class="text-red text-price lf-font-42 lf-font-bold">
 									{{applyDetails.order.selling_price}}
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>
@@ -29,7 +30,7 @@
 				<view class="bg-white">
 					<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
 						<text class="text-gray lf-font-32">订单金额</text>
-						<view class="text-price lf-font-32 text-black">
+						<view class="text-price1 lf-font-32 text-black">
 							{{applyDetails.order.amount}}
 						</view>
 					</view>
@@ -41,7 +42,7 @@
 					</view>
 					<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
 						<text class="text-gray lf-font-32">扣费金额</text>
-						<view class="text-price lf-font-32 text-black">
+						<view class="text-price1 lf-font-32 text-black">
 							{{applyDetails.order.refund_rate_amount}}
 						</view>
 					</view>
@@ -54,7 +55,7 @@
 				<view class="bg-white">
 					<view class="cu-bar padding-lr solid-bottom flex justify-between align-center text-center">
 						<text class="text-gray lf-font-32">可退金额</text>
-						<view class="text-price lf-font-32 text-black">
+						<view class="text-price1 lf-font-32 text-black">
 							{{applyDetails.order.refund_amount}}
 						</view>
 					</view>
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index fab1ae4..b7101c3 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -21,12 +21,11 @@
 							</view>
 							
 							<view class="flex justify-between margin-top-sm">
-								<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 12rpx;">
+								<lf-price :price="orderDetails.goods.specs[0].selling_price" /> 
+								
+								
+								<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 12rpx;">
 									{{Number(orderDetails.goods.specs[0].selling_price || 0)}}
-								</view>
-								<!-- <view>
-									<button v-if="true" class="cu-btn line-orange round margin-left-sm text-sm">申请退款</button>
-									<button v-else class="cu-btn line-gray bg-gray round margin-left-sm text-sm">退款中</button>
 								</view> -->
 							</view>
 						</view>
@@ -61,10 +60,11 @@
 					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center shadow">
 						<view class="flex align-center">
 							<text class="lf-font-28 text-gray">应付款：</text>
-							<view class="text-red text-price lf-font-42 lf-font-bold">
-								<!-- {{Number(orderDetails.goods.specs[0].selling_price*num  || 0)}} -->
+							
+							<lf-price :price="total(num, orderDetails.goods.specs[0].selling_price)" /> 
+							<!-- <view class="text-red text-price lf-font-42 lf-font-bold">
 								{{ total(num, orderDetails.goods.specs[0].selling_price) }}
-							</view>
+							</view> -->
 						</view>
 						<button class="cu-btn block bg-orange round shadow" @tap="submit">
 							<text class="cuIcon-loading2 cuIconfont-spin  margin-right-xs text-white" v-if="loading"></text>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 18b46d5..808d2c1 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -13,16 +13,17 @@
 						<view class="cu-tag badge tag-self lf-font-28 font-400" :style="{'background-color':item.state_text.bg_color,'color':item.state_text.color}">{{item.state_text.text}}</view>
 					</view>
 					<view class="right">
-						<view class="lf-line-2 title" style="line-height: 40rpx;">网红辣椒棒 魔鬼辣椒挑战全网第一辣 网红优惠季 </view>
+						<view class="lf-line-2 title" style="line-height: 40rpx;">{{item.goods.name}}</view>
 						<view class="lf-flex tips" style="margin: 0!important;">
 							<text class="progress margin-right-xs">数量</text>
 							<text class="bought">x {{item.number}}</text>
 						</view>
 						<view class="lf-row-between price" style="padding-right: 6rpx;">
-							<text class="lf-font-bold">
+							<!-- <text class="lf-font-bold">
 								<text class="lf-font-24">￥</text>
 								<text class="lf-font-42">{{item.selling_price}}</text>
-							</text>
+							</text> -->
+							<lf-price :price="item.selling_price" style="margin-top: 10rpx;" />
 							<button  v-if="item.state==1"  @tap.stop="$routerGo('/pages/order/confirm-order?type=1&goods_id='+item.goods_id+'&goods_specs_id='+item.goods_specs_id +'&order_id='+ item.id)">立即付款</button>
 							<button  v-if="item.state==2" class="cu-btn bg-green round margin-left-sm" @tap="$routerGo('/pages/order/order-details?order_id='+item.id)">立即使用</button>
 							<button  v-if="item.state==4" class="cu-btn1 border round margin-left-sm">等待审核</button>
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index 77da6bc..ee8ab2c 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -14,9 +14,10 @@
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.number}}</text>
 							
 							<view class="flex justify-between" style="margin-top: 28rpx;">
-								<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
+								<lf-price :price="orderDetails.selling_price" style="margin-top: 8rpx;" /> 
+							<!-- 	<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
 									{{Number(orderDetails.selling_price || 0)}}
-								</view>
+								</view> -->
 								<view>
 									<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
 									<button v-else class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>
@@ -85,9 +86,12 @@
 					<view class="padding-lr padding-tb-sm bg-white flex justify-between align-center solid-top1 btn-bottom">
 						<view class="flex align-center">
 							<text class="text-gray lf-font-28" style="margin-right: 20rpx;">实付款</text>
-							<view class="text-red text-price lf-font-42 lf-font-bold">
+							<lf-price :price="orderDetails.amount" /> 
+							
+							
+							<!-- <view class="text-red text-price lf-font-42 lf-font-bold">
 								{{Number(orderDetails.amount || 0)}}
-							</view>
+							</view> -->
 						</view>
 						<view class="lf-font-32 text-black1">
 							{{orderDetails.state_text.text}}
diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue
index 823c894..e48bb78 100644
--- a/pages/order/unpay-details.vue
+++ b/pages/order/unpay-details.vue
@@ -15,9 +15,10 @@
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.number}}</text>
 							
 							<view class="flex justify-between" style="margin-top: 28rpx;">
-								<view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
+								<lf-price :price="orderDetails.selling_price" /> 
+								<!-- <view class="text-red text-price lf-font-42 lf-font-bold" style="margin-top: 16rpx;">
 									{{Number(orderDetails.selling_price || 0)}}
-								</view>
+								</view> -->
 								<view>
 									<button v-if="orderDetails.state == 2" class="cu-btn line-orange text-orange round margin-left-sm lf-font-28" @tap="$routerGo('/pages/order/apply-refund?order_id='+orderDetails.id)">申请退款</button>
 									<button v-if="orderDetails.state == 5" class="cu-btn line-gray bg-white border round margin-left-sm lf-font-28">{{orderDetails.state_text.text}}</button>