细节优化

pages/order/order.vue

@@ -219,14 +219,6 @@
 					<text class="cuIcon-right " :class="useCouponList.length?'text-pink':'text-gray'"></text>
 				</view>
 			</view>
-			<view v-if="computePriceInfo.totalFeeNow" class="flex-between price">
-				<text class="text-black text-left">应付金额</text>
-				<view class="flex-row">
-					<!-- <text class="text-pink text-sm text-bold" style="margin-bottom: 3upx;">{{computePriceInfo.couponFee>0?'-':''}}￥</text> -->
-					<text class="text-pink">￥</text>
-					<text class="text-pink text-lg text-bold">{{computePriceInfo.totalFeeNow||0}}</text>
-				</view>
-			</view>		
 			<view class="flex-between price">
 				<text class="text-black text-left">可用时长</text>
 				<view class="flex-row">
@@ -261,19 +253,26 @@
 					<text class="text-pink text-lg text-bold">{{computePriceInfo.balance}}</text>
 				</view>
 			</view>
-
-			<view v-if="computePriceInfo.totalFee - computePriceInfo.totalFeeNow > 0" class="flex-between price">
+			<view v-if="computePriceInfo.discount > 0 && computePriceInfo.discount < 100" class="flex-between price">
 				<view class="flex-row-center">
 					<text class="text-black text-left">会员折扣</text>
 					<view class="vip-tag-box">
 						<image :src="assetsPath+'/huiyuan.png'" mode="widthFix"></image>
-						<text>会员日{{computePriceInfo.discount}}折</text>
+						<text>会员日{{computePriceInfo.discountText || computePriceInfo.discount}}折</text>
 					</view>
 				</view>
 				<view class="flex-row-center">
 					<text class="text-pink text-xl text-bold" style="margin-right: 6upx;">-</text>
 					<text class="text-pink text-bold">￥</text>
-					<text class="text-pink text-lg text-bold">{{(computePriceInfo.totalFee - computePriceInfo.totalFeeNow).toFixed(2)}}</text>
+					<text class="text-pink text-lg text-bold">{{(computePriceInfo.memberDiscount).toFixed(2)}}</text>
+				</view>
+			</view>
+			<view v-if="computePriceInfo.totalFeeNow" class="flex-between price">
+				<text class="text-black text-left">应付金额</text>
+				<view class="flex-row">
+					<!-- <text class="text-pink text-sm text-bold" style="margin-bottom: 3upx;">{{computePriceInfo.couponFee>0?'-':''}}￥</text> -->
+					<text class="text-pink">￥</text>
+					<text class="text-pink text-lg text-bold">{{computePriceInfo.totalFeeNow||0}}</text>
 				</view>
 			</view>
 			
@@ -1253,7 +1252,19 @@
 				computePrice(params).then(res => {
 					// uni.hideLoading()
 					if (res.data.code == 200) {
-						this.computePriceInfo = res.data.data;
+						let obj = res.data.data
+						let discountText = obj.discount;
+						
+						if(obj.discount > 0 && obj.discount < 100){
+							discountText = Number(obj.discount.toString().split('').reverse().join('')).toString();
+							if(discountText.length ==2){
+								discountText = obj.discount;
+							}
+						}
+						this.computePriceInfo = {
+							...obj,
+							discountText
+						} ;
 					} else {
 						uni.showToast({
 							icon: "none",