优惠券修改

pages/index/couponShare.vue

@@ -4,13 +4,21 @@
 
 		<view class="detailBg">
 			<view class="detailTop">
-				<view class="leftB">
+				<view class="leftB" v-if="detail.discountType==1">
 					<view class="use">￥<span class="use2">{{detail.actMoney}}</span></view>
-					<!-- <view class="used" v-else>￥<span class="used2">{{detail.actMoney}}</span></view> -->
 					<view class="tiaojian">{{detail.whereMoney!==0?'满'+detail.whereMoney+'元可用':'满任意金额可用'}}</view>
 				</view>
+				<view v-if="detail.discountType!=1" class="leftB" style="display: flex;align-items: center;justify-content: center;">
+					<image src="http://dmsphoto.66km.com.cn/thFiles/5340A784-FEE2-43FA-8ED1-C509FADFDBED.png"
+					 mode="" style="width: 77rpx;height:48rpx;"></image>
+				</view>
 				<view class="centerB">
-					<view class="name">{{detail.actName}}</view>
+					<view class="name">
+						<span class="djq" v-if="detail.discountType==1">代金券</span>
+						<span class="djq" v-if="detail.discountType==2">商品券</span>
+						<span class="djq" v-if="detail.discountType==3">服务券</span>
+						<span>{{detail.actName}}</span>
+					</view>
 					<view class="time" v-if="detail.startTime">
 						有效期：{{detail.startTime.slice(0,10)}}-{{detail.endTime.slice(0,10)}}</view>
 					<view class="time" v-else>有效期：领取后{{detail.endOffsetDays}}天有效</view>
@@ -31,15 +39,16 @@
 
 			</view>
 			<view style="margin-bottom: 30rpx;">
-				<view class="titleBox">
-					<image src="../../static/img/icon_youhui_red.png" mode="" class="redPoint"></image>
-					<view class="title">适用门店</view>
+				<view style="display: flex;justify-content: space-between;">
+					<view class="titleBox">
+							<image src="../../static/img/icon_youhui_red.png" mode="" class="redPoint"></image>
+							<view class="title">适用门店</view>
 					</view>
-
-					<view v-for="(v,index) in detail.shopNames.split(',')">
-						<view class="content">{{v}}</view>
-					</view>
-
+						<view @click="spShopS" style="color: #666666;font-size: 24rpx;line-height: 24rpx;display: flex;">
+						{{detail.shopNames.split(',').length}}家门店通用
+						<image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
+					    </view>
+				</view> 
 				
 			</view>
 
@@ -69,6 +78,20 @@
 			</view>
 		</view>
 		
+		<!-- 适用门店 -->
+		<view class="authorizBox" v-if="spShopShow" @click="spShopHide">
+			<view class="syShopBox"  @click.stop="">
+				<view class="chBox2">
+					<view class="syShopTitle">适用门店</view>
+					<img src="../../static/timg/chahao.png" alt="" class="chahaoImg" @click="spShopHide"/>
+				</view>
+				<view class="spShopLineBox">
+					<view class="spShopLine" v-for="(item,index) in detail.shopNames.split(',')">{{item}}</view>
+				</view>
+			</view>
+			
+		</view>
+		
 	</view>
 </template>
 
@@ -85,6 +108,7 @@
 				ext:'',
 				wxOpenData:'',
 				scene:'',
+				spShopShow:false,
 			}
 		},
 		onLoad(opt) {
@@ -121,6 +145,12 @@
 			
 		},
 		methods: {
+			spShopHide(){
+				this.spShopShow=false;
+			},
+			spShopS(){
+				this.spShopShow=true;
+			},
 			hideSq(){
 				this.authorizShow=false;
 			},
@@ -177,6 +207,11 @@
 				}
 				this.$http(url, params, 'GET').then(res => {
 					uni.hideLoading();
+					if(res.data.couContent){
+						res.data.couContent=res.data.couContent.replaceAll('font-size:15px', 'font-size:12px');
+						res.data.couContent=res.data.couContent.replaceAll('font-size: 15px', 'font-size:12px');
+						res.data.couContent=res.data.couContent.replaceAll('font-size:14px', 'font-size:12px');
+					}
 					this.detail = res.data;
 
 
@@ -211,6 +246,56 @@
 </script>
 
 <style scoped>
+	.djq{
+		background: linear-gradient(128deg, #FFE4C5 0%, #FDC692 100%);
+		border-radius: 4rpx;
+		height: 34rpx;
+		width: 76rpx;
+		line-height: 34rpx;
+		text-align: center;
+		color: #2B2219;
+		font-size: 20rpx;
+		margin-top: 4rpx;
+		margin-right: 10rpx;
+	}
+	.centerB{
+		padding-top: 10rpx;
+	}
+	.chahaoImg{
+		width: 36rpx;height: 36rpx;
+	}
+	.titleBox span{
+		font-size: 12px;
+	}
+	.syShopBox{
+		background: #FFFFFF;
+		border-radius: 32rpx 32rpx 0rpx 0rpx;
+		width: 750rpx;
+		height: 80vh;
+		margin-top: 20vh;
+	}
+	.spShopLineBox{
+		height: calc(80vh - 90rpx);
+		overflow-y: scroll;
+	}
+	.spShopLine{
+		color: #333333;font-size: 26rpx;
+		padding: 26rpx 30rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.chBox2{
+		display: flex;justify-content: space-between;
+		padding-left: 30rpx;
+		padding-top: 30rpx;
+		padding-right: 24rpx;
+		padding-bottom: 10rpx;
+	}
+	.syShopTitle{
+		font-weight: 500;
+		color: #333333;
+		font-size: 30rpx;
+		line-height: 42rpx;
+	}
 	.bottomBtn{
 		width:704rpx;
 		line-height: 88rpx;

pages/index/discountCard.vue

@@ -403,7 +403,7 @@
 		width: 118rpx;
 		height: 100rpx;
 		position: absolute;
-		top: -38rpx;
+		top: -24rpx;
 		right: 0;
 	}
 	.shareB{

pages/index/discountCardDetail.vue

@@ -4,22 +4,24 @@
 
 		<view class="detailBg">
 			<view class="detailTop">
-				<view class="leftB">
+				<view class="leftB" v-if="detail.discountType==1">
 					<view class="use">￥<span class="use2">{{detail.actMoney}}</span></view>
-					<!-- <view class="used" v-else>￥<span class="used2">{{detail.actMoney}}</span></view> -->
 					<view class="tiaojian">{{detail.whereMoney!==0?'满'+detail.whereMoney+'元可用':'满任意金额可用'}}</view>
 				</view>
+				<view v-if="detail.discountType!=1" class="leftB" style="display: flex;align-items: center;justify-content: center;">
+					<image src="http://dmsphoto.66km.com.cn/thFiles/5340A784-FEE2-43FA-8ED1-C509FADFDBED.png"
+					 mode="" style="width: 77rpx;height:48rpx;"></image>
+				</view>
 				<view class="centerB">
 					<view class="name">
-					<span class="djq" v-if="detail.discountType==1">代金券</span>
-					<span class="djq" v-if="detail.discountType==2">商品券</span>
-					<span class="djq" v-if="detail.discountType==3">服务券</span>
-					<span>{{detail.actName}}</span>
-					
+						<span class="djq" v-if="detail.discountType==1">代金券</span>
+						<span class="djq" v-if="detail.discountType==2">商品券</span>
+						<span class="djq" v-if="detail.discountType==3">服务券</span>
+						<span>{{detail.actName}}</span>
 					</view>
-					<view class="time" v-if="detail.startTime">
+				    <view class="time" v-if="detail.startTime">
 						有效期：{{detail.startTime.slice(0,10)}}至{{detail.endTime.slice(0,10)}}</view>
-					<view class="time" v-else>有效期：领取后{{detail.endOffsetDays}}天</view>
+					<view class="time" v-else>有效期：领取后{{detail.endOffsetDays}}天</view> 
 				</view>
 
 			</view>
@@ -38,12 +40,11 @@
 							{{detail.shopNames.split(',').length}}家门店通用
 							<image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
 						    </view>
-					</view>
+					</view> 
 				    
-
-					<view v-for="(v,index) in detail.shopNames.split(',')" v-if="index<5">
+					<!-- <view v-for="(v,index) in detail.shopNames.split(',')" v-if="index<5">
 						<view class="content">{{v}}</view>
-					</view>
+					</view> -->
 
 				
 			</view>
@@ -225,9 +226,12 @@
 				}
 				this.$http(url, params, 'GET').then(res => {
 					uni.hideLoading();
-					res.data.couContent=res.data.couContent.replaceAll('font-size:15px', 'font-size:12px');
-					res.data.couContent=res.data.couContent.replaceAll('font-size: 15px', 'font-size:12px');
-					res.data.couContent=res.data.couContent.replaceAll('font-size:14px', 'font-size:12px');
+					if(res.data.couContent){
+						res.data.couContent=res.data.couContent.replaceAll('font-size:15px', 'font-size:12px');
+						res.data.couContent=res.data.couContent.replaceAll('font-size: 15px', 'font-size:12px');
+						res.data.couContent=res.data.couContent.replaceAll('font-size:14px', 'font-size:12px');
+					}
+					
 					this.detail = res.data;
 
 
@@ -253,6 +257,9 @@
 	.titleBox span{
 		font-size: 12px;
 	}
+.centerB{
+	padding-top: 10rpx;
+}
 .syShopBox{
 	background: #FFFFFF;
 	border-radius: 32rpx 32rpx 0rpx 0rpx;

pages/index/shopList.vue

@@ -72,11 +72,12 @@
         <uni-popup ref="popup" type="right" :mask-click="true">
 			<view class="popup-content">
 				<scroll-view class="brandList" scroll-y="true">
+					<!-- :class="{areaActvie:item.area==areaName}" -->
 					<view v-for="item in areaList" class="areaListLine"
-					 :class="{areaActvie:item.area==areaName}"
+					 
 					 @click="checkarea(item)">
 					  <span >{{item.area}}</span>
-					<!--  <image src="" mode=""></image> -->
+					  <image v-if="item.code==area" class="areaCkIcon" src="http://dmsphoto.66km.com.cn/thFiles/0A1DADEA-1807-4ABC-B391-ECC8B1882DA4.png" mode=""></image>
 					</view>
 				</scroll-view>
 			</view>
@@ -135,6 +136,9 @@
 			if(selectCity){
 				this.cityName=selectCity.city
 				this.cityCode=selectCity.code
+				this.areaName='区域'
+				this.area=''
+				this.getAreaList()
 				this.getqueryShopList() //获取门店列表
 			}
 		},
@@ -281,6 +285,9 @@
 </script>
 
 <style scoped>
+.areaCkIcon{
+	width: 38rpx;height: 28rpx;
+}
 	.popup-content{
 		width: 590rpx;
 		background: #FFFFFF;
@@ -290,10 +297,13 @@
 		height:99vh;
 	}
 	.areaListLine{
-		padding: 20rpx;
+		padding:30rpx 24rpx;
 		color: #666666;
 		font-size: 28rpx;
 		border-bottom: 1px solid #eaeaea;
+		display: flex;
+		justify-content: space-between;
+		line-height: 28rpx;
 	}
 	.areaActvie{
 		background: #F19D01;

pages/subPack/chooseCity.vue

@@ -256,7 +256,8 @@
 
 	.scroll-view {
 		width: 100%;
-		height: calc(100vh - 80rpx);
+		/* height: calc(100vh - 80rpx); */
+		height: 100vh;
 		box-sizing: border-box;
 		padding: 20rpx 24rpx 20rpx;
 

pages/subPack/depositDetail.vue

@@ -64,7 +64,7 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">生产时间：</view>
-				<view class="informationNum">{{item.createTime}}</view>
+				<view class="informationNum">{{item.productDate}}</view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">外伤检测：</view>
@@ -111,6 +111,11 @@
 			
 		},
 		methods: {
+			seeBy() {
+				uni.navigateTo({
+					url: '../user/historyDetail?id=' + this.data.billSheetID
+				})
+			},
 			seeImg(imgList){
 				uni.previewImage({
 					urls: imgList.split(','),
@@ -244,7 +249,6 @@
 .bottom {
 		display: flex;
 		justify-content: flex-end;
-		padding: 20rpx;
 		background-color: #FFFFFF;
 		align-items: center;
 		height: 98rpx;

pages/subPack/rescueOrderOrderDetail.vue

@@ -120,7 +120,7 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">下单人：</view>
-				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openShopHelpSheet.mobilePhone}}</view>
+				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openUser.mobilePhone}}</view>
 			</view>
 			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">

pages/user/checkReport.vue

@@ -6,7 +6,7 @@
 	  	<view style="height: 44px;"></view>
 	     <picker @change="bindPickerChange" :value="index" :range="array">
 	  		<view class="screenName"> <span>车牌号：{{array[index]}}</span> 
-	  		  <image src="../../static/timg/CS.png" mode="" class="jtImg"></image>
+	  		  <image src="../../static/timg/icon_arrow_right.png" mode="" class="jtImg"></image>
 	  		</view>
 	  	</picker>
 	  </view>
@@ -153,7 +153,8 @@
 		padding-top: 20rpx;
 	}
 	.jtImg{
-		width: 24rpx;height: 24rpx;
+		width: 12rpx;height: 20rpx;
+		margin-top: 10rpx;
 	}
 	.screenBox{
 		background: #FFFFFF;

pages/user/historySpend.vue

@@ -6,7 +6,7 @@
 			<view style="height: 44px;"></view>
 		   <picker @change="bindPickerChange" :value="index" :range="array">
 				<view class="screenName"> <span>车牌号：{{array[index]}}</span> 
-				  <image src="../../static/timg/CS.png" mode="" class="jtImg"></image>
+				  <image src="../../static/timg/icon_arrow_right.png" mode="" class="jtImg"></image>
 				</view>
 			</picker>
 		</view>
@@ -295,7 +295,8 @@
 		
 	}
 .jtImg{
-	width: 24rpx;height: 24rpx;
+	width: 12rpx;height: 20rpx;
+	margin-top: 10rpx;
 }
 .screenBox{
 		background: #FFFFFF;