bug修改

pages/addjk/eadit.vue

@@ -479,7 +479,7 @@
 		  preview(){
 			  if(this.isExistGroup){
 				  uni.showToast({
-				  	 title: '正在有拼团的单子请勿修改',
+				  	 title: '已有用户参与该拼团活动,无法修改活动内容',
 				  	 icon:'none',
 				  	 duration: 3000
 				  });

pages/addjk/jkDetail.vue

@@ -4,7 +4,11 @@
 			<img :src="info.img" alt="" class="topimg">
 		</view>
 		<view class="cont">
-			<view class="name">{{info.activityName}}</view>
+			<view class="name">
+			  <view class="ptNameBz" v-if="info.groupType">
+			  				  {{info.groupNumber}}人团
+			  </view>
+			{{info.activityName}}</view>
 			<view class="name2">{{info.startTime.slice(0,10)}}~{{info.endTime.slice(0,10)}}</view>
 			<view class="name3">{{info.activityContent}}</view>
 		</view>
@@ -259,6 +263,17 @@
 </script>
 
 <style scoped>
+	.ptNameBz{
+		font-weight: 500;line-height: 32rpx;
+	    font-size: 22rpx;height: 32rpx;
+		color: #FD0F00;margin-top: 5rpx;margin-right: 10rpx;
+		background: url('http://dmsphoto.66km.com.cn/thFiles/2AF1130F-C318-45D3-B057-FA0728B41046.png') no-repeat;
+		background-size: 100% 100%;
+		padding-left: 64rpx;padding-right: 4rpx;
+	}
+	.name{
+		display: flex;
+	}
 	.mp3Img{
 	 /* transform: translate(-1584.4%, 121.5%) scale(1); */
 	  position: fixed;

pages/myOrder/myOrder.vue

@@ -75,13 +75,19 @@
 		  <view class="screenCont" @click.stop="">
 			  <view class="screenTitle">筛选</view>
 			  <view class="screenBt">订单类型</view>
-			  <view class="typelineBox">
+			<!--  <view class="typelineBox">
 				  <view class="typeLine " :class="{typeactive:typeLineIndex==0}" @click="typeLineCk(0)">全部</view>
 				  <view class="typeLine" :class="{typeactive:typeLineIndex==1}" @click="typeLineCk(1)">商城订单</view>
 				  <view class="typeLine" :class="{typeactive:typeLineIndex==6}" @click="typeLineCk(6)">集客订单</view>
 				  <view class="typeLine" :class="{typeactive:typeLineIndex==4}" @click="typeLineCk(4)">救援订单</view>
 				  <view class="typeLine":class="{typeactive:typeLineIndex==5}" @click="typeLineCk(5)">钣喷订单</view>
-			  </view>
+			  </view> -->
+			  <view class="typelineBox">
+			  	  <view class="typeLine " v-for="(item,index) in tabList" 
+				    :class="{typeactive:item.ck}" @click="typeLineCk2(item)">{{item.name}}
+				  </view>
+			  	 
+			    </view>
 			  <view class="screenBt">门店</view>
 			  <view class="">
 			  	   <picker @change="bindPickerChange" :value="pickerindex" :range-key="'shopName'" :range="pickerarray">
@@ -135,6 +141,24 @@
 				sheetTypeList:'',
 				shopId:'',
 				mrshopId:'',
+				mrshopName:'',
+				tabList:[
+					{
+					  name:'全部',ck:true,sheetType:'',
+					},
+					{
+					  name:'商城订单',ck:false,sheetType:'1,2,3',
+					},
+					{
+					  name:'集客订单',ck:false,sheetType:'6',
+					},
+					{
+					  name:'救援订单',ck:false,sheetType:'4',
+					},
+					{
+					  name:'钣喷订单',ck:false,sheetType:'5',
+					}
+				]
 			}
 		},
 		onLoad(opt) {
@@ -153,19 +177,33 @@
 		
 		methods: {
 			ssql(){
-				this.name=''
+				this.name='';
+				this.getData();
 			},
 			sub(){
 				this.screenSHow=false;
+				var arr=[]
+				this.tabList.forEach(item=>{
+					if(item.ck){
+						arr.push(item.sheetType)
+					}
+				})
+				this.sheetTypeList=arr.join(',');
+				console.log(this.sheetTypeList)
 				this.getData();
 			},
 			resetting(){
 				this.date1='';
 				this.date2='';
 				this.typeLineIndex='';
-				this.shopName='';
-				this.shopId='';
+				this.shopName=this.mrshopName;
+				this.shopId=this.mrshopId;
 				this.sheetTypeList=''
+				this.tabList[0].ck=true
+				this.tabList[1].ck=false
+				this.tabList[2].ck=false
+				this.tabList[3].ck=false
+				this.tabList[4].ck=false
 			},
 			typeLineCk(num){
 				this.typeLineIndex=num;
@@ -178,6 +216,19 @@
 					this.sheetTypeList=''
 				}
 			},
+			typeLineCk2(item){
+				if(item.name=='全部'){
+					item.ck=true;
+					this.tabList[1].ck=false
+					this.tabList[2].ck=false
+					this.tabList[3].ck=false
+					this.tabList[4].ck=false
+				}else{
+					this.tabList[0].ck=false
+					item.ck=!item.ck;
+				}
+				
+			},
 			screenSHowBtn(){
 				this.screenSHow=true;
 			},
@@ -200,6 +251,7 @@
 				this.$http('openH5SetTheGuest/getShopInfo',{},'GET').then(res => {
 						this.shopName=res.data.shopName;
 						this.mrshopId=this.shopId;
+						this.mrshopName=res.data.shopName;
 						this.shopId=this.shopId
 						this.getShopList();
 				 })
@@ -374,7 +426,7 @@
 		left: 0;
 	}
 	.typeLine{
-		width: 179rpx;color: #3C3C3C;
+		width: 178rpx;color: #3C3C3C;
 		height: 64rpx;font-size: 24rpx;
 		background: #F4F5F7;margin-top: 20rpx;
 		border-radius: 36rpx;margin-right: 30rpx;
@@ -382,7 +434,7 @@
 		line-height: 64rpx;
 	}
 	.typeactive{
-		border: 2rpx solid #D53533;height: 60rpx;color: #D53533;background: #FFFFFF;
+		border: 2rpx solid #D53533;height: 60rpx;color: #D53533;background: #FFFFFF;width: 174rpx;
 	}
 	.typelineBox{
 		display: flex;flex-wrap: wrap;padding-left: 20rpx;