Merge branch 'dev' into atsMaster

# Conflicts:
#	pages/index/confirmRescue.vue
#	pages/index/shopList.vue
#	pages/integral/integralgoodsDetail.vue
#	pages/user/user.vue
#	utils/common.js
#	utils/request.js

pages/index/confirmRescue.vue

@@ -209,6 +209,9 @@
 					return false;
 				}
 				this.isGoing=true;
+				uni.showLoading({
+				 	title: '加载中'
+				});
 				this.$http('openShopHelpSheetOrder/submitOrder', {
 				  helpType:this.opt.type,
 				  //customerName: this.customerName,
@@ -227,7 +230,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

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

pages/index/index.vue

@@ -756,7 +756,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>
@@ -14,7 +19,9 @@
 				<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
 			</view>
 		</view>
-		<view style="height: 90rpx;"></view>
+		
+		
+		<view style="height: 210rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
 			<view class="shoplineLeft">
 				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
@@ -127,9 +134,19 @@
 				authorizShow:false,
 				wxOpenData:'',
 				userInfo: '',
+				shopName:'',
+				inputChShow:false,
 			}
 		},
-
+        watch:{
+			shopName(val){
+				console.log(val)
+				if(val){
+					this.inputChShow=true
+				}
+			},
+        		
+        },
 		onLoad() {
 			var that = this;
 			uni.removeStorageSync('selectCity');
@@ -170,6 +187,14 @@
 			}
 		},
 		methods: {
+			empty(){
+				
+				this.shopName='';
+				this.inputChShow=false;
+				this.queryShopList=[];
+				this.page=1;
+				this.getqueryShopList()
+			},
 			authorizShowno(){
 				this.authorizShow=false
 			},
@@ -405,7 +430,8 @@
 					lat: this.location.lat ? this.location.lat : '',
 					lng: this.location.lng ? this.location.lng : '',
                     city:this.cityCode,
-                    area:this.area
+                    area:this.area,
+					shopName:this.shopName
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.queryShopList = res.data.shop;
@@ -510,7 +536,7 @@
 	margin-bottom: 20rpx;
 	position: fixed;
 	width: 100vw;
-	top: 0;left: 0;
+	top: 118rpx;left: 0;
 }
 	.box {
 		min-height: 100vh;
@@ -826,4 +852,38 @@
 		margin-top: 62rpx;
 		margin-left:71rpx;
 	}
+	.sstopInput{
+		width: 626rpx;
+		height: 72rpx;
+		background: #F4F5F7;
+		border-radius: 36rpx;
+		line-height: 72rpx;
+		font-size: 28rpx;
+		padding-left: 76rpx;
+	}
+	.sstop{
+		position: fixed;
+		padding-top: 24rpx;
+		padding-left: 24rpx;
+		background: #ffffff;
+		width: 100vw;
+		top: 0rpx;
+		left: 0;
+		padding-bottom: 20rpx;
+	}
+	.sstopimg{
+		width: 40rpx;
+		height: 40rpx;
+		position: absolute;
+		left: 44rpx;
+		top: 40rpx;
+	}
+	.inputCh{
+	width:40rpx;
+	height: 40rpx;
+	position: absolute;
+	right: 60rpx;
+	top: 40rpx;
+	z-index: 11;
+	}
 </style>

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/shop/shop.vue

@@ -526,7 +526,7 @@
 		height: 100rpx;
 		position: fixed;
 		right: 24rpx;
-		bottom: 60rpx;
+		bottom: 40rpx;
 	}
 	.timeTbox{
 			
@@ -575,7 +575,7 @@
 width:40rpx;
 height: 40rpx;
 position: absolute;
-right: 40rpx;
+right: 60rpx;
 top: 40rpx;
 z-index: 11;
 }

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 yhprice" 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 yhprice" 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,23 @@
 					<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 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 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>
+					</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 +357,12 @@
 				ShowSetting:'',
 				goodsMoney:'',
 				Picture:false,//图片
-				imgList:[]
+				imgList:[],
+				ItemMoneyReal:false,
+				goodsMoneyReal:false,
+				DiscountMoneyDetail:false,
+				DiscountMoneyDetailNullZero:false,
+				dmShow:false,
 			}
 		},
 		onLoad(opt) {
@@ -360,6 +393,9 @@
 		},
 
 		methods: {
+			dmBtn(){
+				this.dmShow=!this.dmShow
+			},
 			seeImg(index){
 				console.log(index)
 				var imgs=[]
@@ -461,6 +497,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 +725,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 +1481,18 @@
 	.goodscostTxt{
 		    color: #999999;
 	}
-</style>
+	.DiscountMoneyIcon{
+	  width: 30rpx;height: 20rpx;	margin-top: 10rpx;
+	  margin-left: 10rpx;
+	}
+	.DiscountMoneyTop{
+		display: flex;
+	}
+	.yhprice{
+		color: #FF0000;
+	}
+	.yhmx .goodsCostNum3{
+		color: #666;
+		font-weight: 400;
+	}
+</style>