历史消费修改

pages/index/confirmRescue.vue

@@ -189,6 +189,9 @@
 					return false;
 				}
 				this.isGoing=true;
+				uni.showLoading({
+				 	title: '加载中'
+				});
 				this.$http('openShopHelpSheetOrder/submitOrder', {
 				  helpType:this.opt.type,
 				  customerName: this.customerName,
@@ -207,7 +210,7 @@
 				  endLng:this.opt.endLng,
 				  endLat:this.opt.endLat,
 				 },'POST').then(res => {
-					console.log(res)
+					uni.hideLoading();
 					var id=res.data
 					console.log(id)
 					 if(res.code==0){

pages/index/confirmYuyue.vue

@@ -137,6 +137,9 @@
 					return false
 				}
 				 this.isgo=false;
+				 uni.showLoading({
+				  	title: '加载中'
+				 });
 				this.$http('openreservation/saveOrderSheet', {
 				  billDate: this.billDate,
 				  comment: this.comment,
@@ -146,6 +149,7 @@
 				  unionId: this.userInfo.unionId,
 				  stationID:this.stationID
 				 },'POST').then(res => {
+					 uni.hideLoading();
 					    this.isgo=true;
 					    var id=res.data
 						if(res.code==0){

pages/user/historyDetail.vue

@@ -178,7 +178,7 @@
 									单价：<span class="SalePrice">{{item.SalePrice}}</span>
 								</view>
 							</view>
-							<view class="price" v-if="ItemMoneyReal">
+							<view class="price yhprice" v-if="ItemMoneyReal">
 								<span>￥</span>
 								{{item.discountPriceReal?item.discountPriceReal:0}}
 							</view>
@@ -227,7 +227,7 @@
 									单价：<span class="SalePrice">{{item.SalePrice}}</span>
 								</view>
 							</view>
-							<view class="price" v-if="goodsMoneyReal">
+							<view class="price yhprice" v-if="goodsMoneyReal">
 								<span>￥</span>
 								{{item.discountPriceReal?item.discountPriceReal:0}}
 							</view>
@@ -255,10 +255,11 @@
 					<view class="goodscostTxt">优惠总计</view>
 					<view class="goodsCostNum3 DiscountMoneyTop">
 						<span>￥{{orderData.billsheet.TotalDiscountMoney?orderData.billsheet.TotalDiscountMoney:0}}</span>
-						<image class="DiscountMoneyIcon" src="../../static/img/icon_arrow_down.png" mode=""></image>
+						<image v-if="DiscountMoneyDetail&&!dmShow" class="DiscountMoneyIcon" src="../../static/img/icon_arrow_down.png" mode=""></image>
+						<image v-if="DiscountMoneyDetail&&dmShow" class="DiscountMoneyIcon" src="../../static/img/icon_arrow_up.png" mode=""></image>
 					</view>
 				</view>
-				<view v-if="DiscountMoneyDetail&&dmShow"><!-- 优惠明细 -->
+				<view class="yhmx" v-if="DiscountMoneyDetail&&dmShow"><!-- 优惠明细 -->
 					<view class="goodscostLine" v-for="(item,index) in orderData.discountList" v-if="DiscountMoneyDetailNullZero&&item.price!=0">
 						<view class="goodscostTxt">{{item.type}}</view>
 						<view class="goodsCostNum3">￥{{item.price}}</view>
@@ -1487,4 +1488,11 @@
 	.DiscountMoneyTop{
 		display: flex;
 	}
+	.yhprice{
+		color: #FF0000;
+	}
+	.yhmx .goodsCostNum3{
+		color: #666;
+		font-weight: 400;
+	}
 </style>