历史消费

pages/index/index.vue

@@ -748,7 +748,15 @@
 							/* uni.navigateTo({
 							 	url:'rescue'
 							 }) */
+					}else if(item.bizType==19){
+						//我的车库pages/user/addCar/cailist
+						 
+							 uni.navigateTo({
+							 	url:'../user/addCar/cailist'
+							 }) 
 					}
+					
+					
 					// uni.navigateTo({
 					// 	url:url
 					// })

pages/index/shopList.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="box">
+		<view class="sstop">
+			<image src="../../static/timg/icon_search@2x.png" mode="" class="sstopimg"></image>
+			<input type="text" v-model="shopName" placeholder="请输入门店名称" class="sstopInput" @confirm="getqueryShopList">
+			<image src="../../static/img/icon_close.png" mode="" @click="empty" v-if="inputChShow" class="inputCh"></image>
+		</view>
         <view class="regionBox">
 			<view class="regionLine" @click="gocity">
 				<view class="regionTxt">{{cityName}}</view>
@@ -15,11 +20,7 @@
 			</view>
 		</view>
 		
-		<view class="sstop">
-			<image src="../../static/timg/icon_search@2x.png" mode="" class="sstopimg"></image>
-			<input type="text" v-model="shopName" placeholder="请输入商品名称" class="sstopInput" @confirm="getqueryShopList">
-			<image src="../../static/img/icon_close.png" mode="" @click="empty" v-if="inputChShow" class="inputCh"></image>
-		</view>
+		
 		<view style="height: 210rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
 			<view class="shoplineLeft">
@@ -520,7 +521,7 @@
 	margin-bottom: 20rpx;
 	position: fixed;
 	width: 100vw;
-	top: 0;left: 0;
+	top: 118rpx;left: 0;
 }
 	.box {
 		min-height: 100vh;
@@ -851,7 +852,7 @@
 		padding-left: 24rpx;
 		background: #ffffff;
 		width: 100vw;
-		top: 72rpx;
+		top: 0rpx;
 		left: 0;
 		padding-bottom: 20rpx;
 	}

pages/integral/integralgoodsDetail.vue

@@ -59,7 +59,7 @@
 								<span class="jfspan1">{{info.integral}}</span> <span class="jfspan2">积分</span>
 								<span class="marketvalue" v-if="info.salePrice">市场价 ￥{{info.salePrice}}</span>
 							</view>
-							<view class="surplus">剩余{{shopInfo.qty>0?shopInfo.qty:0}}个</view>
+							<view class="surplus" v-if="shopInfo">剩余{{shopInfo.qty>0?shopInfo.qty:0}}个</view>
 						</view>
 					</view>
 				</view>

pages/integral/scoreRecord.vue

@@ -17,17 +17,18 @@
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index">
 
 			<view class="carPlate">
-				<view class="plate" v-if="item.bizType==0">消费抵扣</view>
+				<view class="plate" v-if="item.bizType==0">支付使用积分</view>
 				<view class="plate" v-if="item.bizType==1">积分清理</view>
 				<view class="plate" v-if="item.bizType==2">积分兑换</view>
 				<view class="plate" v-if="item.bizType==3">积分调整</view>
-				<view class="plate" v-if="item.bizType==4">消费积分</view>
-				<view class="plate" v-if="item.bizType==5">消费撤销</view>
-				<view class="plate" v-if="item.bizType==6">抵扣撤销</view>
+				<view class="plate" v-if="item.bizType==4">下单送积分</view>
+				<view class="plate" v-if="item.bizType==5">取消支付回收积分</view>
+				<view class="plate" v-if="item.bizType==6">取消支付返回使用积分</view>
 				<view class="plate" v-if="item.bizType==7">期初导入</view>
 				<view class="plate" v-if="item.bizType==8">兑换取消</view>
 				<view class="plate" v-if="item.bizType==9">每日签到</view>
-				<view class="plate" v-if="item.bizType==10">积分过期</view>
+				<view class="plate" v-if="item.bizType==10">积分过期</view>
+				<view class="plate" v-if="item.bizType==12">评价积分</view>
 				
 				
 				<view class="mileage" v-if="item.type==1">+{{item.integral}}</view>

pages/user/historyDetail.vue

@@ -169,13 +169,20 @@
 						  	{{item.AmountMoney?item.AmountMoney:0}}
 						  </view>
 					  </view>
-						<view class="itemWorkHoursBox" v-if="itemWorkHours||itemPrice" :class="{nopb:ItemComment&&item.Comment}">
-							<view class="itemWorkHours" v-if="itemWorkHours">
-								工时：<span class="SalePrice">{{item.SaleQty}}</span> 
+						<view class="itemWorkHoursBox" v-if="itemWorkHours||itemPrice||ItemMoneyReal" :class="{nopb:ItemComment&&item.Comment}">
+							<view class="itemWorkHoursBoxleft">
+								<view class="itemWorkHours" v-if="itemWorkHours">
+									工时：<span class="SalePrice">{{item.SaleQty}}</span> 
+								</view>
+								<view class="itemPrice" v-if="itemPrice">
+									单价：<span class="SalePrice">{{item.SalePrice}}</span>
+								</view>
 							</view>
-							<view class="itemPrice" v-if="itemPrice">
-								单价：<span class="SalePrice">{{item.SalePrice}}</span>
+							<view class="price" v-if="ItemMoneyReal">
+								<span>￥</span>
+								{{item.discountPriceReal?item.discountPriceReal:0}}
 							</view>
+							
 						</view>
 						<view class="secondBox" v-if="ItemComment" :class="{noLine:index == orderData.listItems.length-1}">
 							<view class="comment" v-if="item.Comment">{{item.Comment}}</view>
@@ -211,13 +218,20 @@
 							</view>
 							<!-- <view class="qty" v-if="goodsNumber">x{{item.SaleQty}}</view> -->
 						</view>
-						<view class="itemWorkHoursBox" v-if="goodsPrice||goodsNumber" :class="{nopb:GoodsComment&&item.Comment}">
-							<view class="itemWorkHours" v-if="goodsNumber">
-								数量：<span class="SalePrice">{{item.SaleQty}}<span v-if="item.Unit">（{{item.Unit}})</span> </span> 
+						<view class="itemWorkHoursBox" v-if="goodsPrice||goodsNumber||goodsMoneyReal" :class="{nopb:GoodsComment&&item.Comment}">
+							<view class="itemWorkHoursBoxleft">
+								<view class="itemWorkHours" v-if="goodsNumber">
+									数量：<span class="SalePrice">{{item.SaleQty}}<span v-if="item.Unit">（{{item.Unit}})</span> </span> 
+								</view>
+								<view class="itemPrice" v-if="goodsPrice">
+									单价：<span class="SalePrice">{{item.SalePrice}}</span>
+								</view>
 							</view>
-							<view class="itemPrice" v-if="goodsPrice">
-								单价：<span class="SalePrice">{{item.SalePrice}}</span>
+							<view class="price" v-if="goodsMoneyReal">
+								<span>￥</span>
+								{{item.discountPriceReal?item.discountPriceReal:0}}
 							</view>
+							
 						</view>
 						<view class="secondBox"  v-if="GoodsComment" :class="{noLine:index == orderData.listParts.length-1}">
 							<view class="comment" v-if="GoodsComment&&item.Comment">{{item.Comment}}</view>
@@ -237,9 +251,22 @@
 					<view class="goodscostTxt">应收总计</view>
 					<view class="goodsCostNum3">￥{{orderData.billsheet.AmountMoney?orderData.billsheet.AmountMoney:0}}</view>
 				</view>
-				<view class="goodscostLine" v-if="TotalDiscountMoney">
+				<view class="goodscostLine" v-if="TotalDiscountMoney" @click="dmBtn">
 					<view class="goodscostTxt">优惠总计</view>
-					<view class="goodsCostNum3">￥{{orderData.billsheet.TotalDiscountMoney?orderData.billsheet.TotalDiscountMoney:0}}</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>
+					</view>
+				</view>
+				<view 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>
+					</view>
+					<view class="goodscostLine" v-for="(item,index) in orderData.discountList" v-if="!DiscountMoneyDetailNullZero">
+						<view class="goodscostTxt">{{item.type}}</view>
+						<view class="goodsCostNum3">￥{{item.price}}</view>
+					</view>
 				</view>
 				<view class="goodscostLine" v-if="CardMoneyT">
 					<view class="goodscostTxt">计次卡冲销</view>
@@ -329,7 +356,12 @@
 				ShowSetting:'',
 				goodsMoney:'',
 				Picture:false,//图片
-				imgList:[]
+				imgList:[],
+				ItemMoneyReal:false,
+				goodsMoneyReal:false,
+				DiscountMoneyDetail:false,
+				DiscountMoneyDetailNullZero:false,
+				dmShow:false,
 			}
 		},
 		onLoad(opt) {
@@ -360,6 +392,9 @@
 		},
 
 		methods: {
+			dmBtn(){
+				this.dmShow=!this.dmShow
+			},
 			seeImg(index){
 				console.log(index)
 				var imgs=[]
@@ -461,6 +496,19 @@
 						if (item.fieldValue == 'goodsMoney') {
 							this.goodsMoney = item.isChecked
 						}
+						if (item.fieldValue == 'ItemMoneyReal') {
+							this.ItemMoneyReal = item.isChecked
+						}
+						if (item.fieldValue == 'goodsMoneyReal') {
+							this.goodsMoneyReal = item.isChecked
+						}
+						if (item.fieldValue == 'DiscountMoneyDetail') {
+							this.DiscountMoneyDetail = item.isChecked
+						}
+						if (item.fieldValue == 'DiscountMoneyDetailNullZero') {
+							this.DiscountMoneyDetailNullZero = item.isChecked
+						}
+						
                         if(item.fieldValue =='Picture'){
 							this.Picture = item.isChecked
 							if(item.isChecked){
@@ -676,11 +724,15 @@
 	}
 	.itemWorkHoursBox{
 		display: flex;
+		justify-content: space-between;
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #999999;
 		padding-top: 20rpx;padding-bottom: 20rpx;
 	}
+	.itemWorkHoursBoxleft{
+		display: flex;
+	}
 	.nopb{
 		padding-bottom: 0px;
 	}
@@ -1428,4 +1480,11 @@
 	.goodscostTxt{
 		    color: #999999;
 	}
-</style>
+	.DiscountMoneyIcon{
+	  width: 30rpx;height: 20rpx;	margin-top: 10rpx;
+	  margin-left: 10rpx;
+	}
+	.DiscountMoneyTop{
+		display: flex;
+	}
+</style>

utils/common.js

@@ -86,11 +86,11 @@ function getExtStoreId(type){
 	 var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
 
 		  /* extConfig={
-		  "shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
-		  "url":"https://apidms.66km.com",
-		  "unionId":"EF7981B9-2D1D-4006-9C0A-66CE7177134D",
-		  "appId":"wx2c6f04c0dcd15984"
-		  } */
+			  "shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
+			  "url":"https://apidms.66km.com",
+			  "unionId":"EF7981B9-2D1D-4006-9C0A-66CE7177134D",
+			  "appId":"wx2c6f04c0dcd15984"
+			 } */
 		  /* extConfig={
 				 "shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
 				 "url":"https://store-api.qdbtl.cn/",

utils/request.js

@@ -8,14 +8,14 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-//const baseUrl=extConfig.url+'/'
+const baseUrl=extConfig.url+'/'
 
 //const baseUrl='http://dms.66km.com.cn/'
- const baseUrl='http://192.168.0.23:20187/' 
+//const baseUrl='http://192.168.0.18:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'
 
-//wxc023ff04deb28f2d正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
+//	wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
 //测试地址
 //const webUrl = 'http://dms.32che.cn/'
 //正式