22

pages/addjk/activity.vue

@@ -39,6 +39,7 @@
 					<view class="time" v-if="item.StartTime">{{item.StartTime.slice(0,10)}}-{{item.EndTime.slice(0,10)}}
 					</view>
 				</view>
+				  <view class="groupType" v-if="item.GroupType==1">拼团</view>
 				<view class="name">{{item.ActivityName}}</view>
 
 				<view class="btns">
@@ -313,7 +314,14 @@
 		min-height: 100vh;
 
 	}
-
+.groupType{
+		width: 76rpx;color: #FFFFFF;
+		height: 36rpx;line-height: 36rpx;text-align: center;
+		background: linear-gradient(109deg, #FD5A04 0%, #FD0900 100%);
+		border-radius: 0rpx 10rpx 0rpx 10rpx;
+		position: absolute;
+		top: 0;right: 0;font-size: 24rpx;
+	}
 	.zdyNavBox {
 		width: 100vw;
 		background: #FFFFFF;
@@ -404,7 +412,7 @@
 		margin: 0rpx 24rpx 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-		
+		position: relative;
 	}
 
 	.itemImg {

pages/addjk/activityDetail.vue

@@ -432,7 +432,7 @@
 		margin-bottom: 10rpx;
 	}
 	.shopName{
-		color: #3C3C3C;
+		color: #3C3C3C;width: 500rpx;
 		font-size: 28rpx;
 	}
 	.shopaddress{

pages/addjk/eadit.vue

@@ -60,7 +60,7 @@
 			  <input  type="number" v-model="number" placeholder="请输入" class="lineRightInput" placeholder-class="inputPlace">
 		  </view>
 		</view>
-		<view class="line"  style="border: none;">
+		<view class="line"  ><!-- style="border: none;" -->
 		  <view class="lineLeft">
 			  <span class="linexx">*</span> <span>支付方式</span>
 		  </view>
@@ -70,7 +70,7 @@
 				 <img src="../../static/img/cky.png" alt="" class="payTypeImg" v-if="payType==1">
 				 <view class="payTypeTxt">在线支付</view>
 			 </view>
-			 <view class="payType" @click="payType=2" style="padding-left: 30rpx;">
+			 <view class="payType" @click="nopayCl" style="padding-left: 30rpx;">
 				 <img src="../../static/img/cky.png" alt="" class="payTypeImg" v-if="payType==2">
 				 <img src="../../static/img/ckn.png" alt="" class="payTypeImg" v-if="payType!=2">
 				 <view class="payTypeTxt">无需支付</view>
@@ -85,6 +85,59 @@
 			  <input type="text" v-model="money" placeholder="请输入" class="lineRightInput" placeholder-class="inputPlace">
 		  </view>
 		</view>
+		<view v-if="payType==1">
+			<view class="line line3">
+				<view class="lineLeft">
+					<span>拼团设置</span>
+				</view>
+				<view class="lineRight"><switch :checked='groupType' @change="switchgroupType" style="transform:scale(0.8)"/></view>
+			</view>
+			<view v-if="groupType">
+				<view class="line" >
+				  <view class="lineLeft">
+					  <span class="linexx">*</span> <span>拼团人数</span>
+				  </view>
+				  <view class="lineRight">
+					  <input type="number" v-model="groupNumber" placeholder="可输入大于1的整数" class="lineRightInput" placeholder-class="inputPlace">
+				  </view>
+				</view>
+				<view class="line" >
+				  <view class="lineLeft">
+					  <span class="linexx">*</span> <span>拼团有效期</span>
+				  </view>
+				  <view class="lineRight">
+					  <input type="number" v-model="groupTime" placeholder="可输入0.5至72小时" class="linecInput" placeholder-class="inputPlace">
+				  </view>
+				  <viwe class="lineRight">小时</viwe>
+				</view>
+				<view class="line" >
+				  <view class="lineLeft">
+					  <span class="linexx">*</span> <span>拼团价</span>
+				  </view>
+				  <view class="lineRight">
+					  <input type="number" v-model="groupMoney" placeholder="需小于支付金额" class="linecInput" placeholder-class="inputPlace">
+				  </view>
+				  <viwe class="lineRight">元</viwe>
+				</view>
+				<view class="line line3">
+					<view class="lineLeft2">
+						 <span class="linexx">*</span><span>拼团超时自动成团</span> 
+						 <image @click="zyct" src="../../static/img/icon_help.png" mode="" class="helpIcon"></image>
+					</view>
+					<view class="lineRight"><switch :checked='groupOutState' @change="switchgroupOutState" style="transform:scale(0.8)"/></view>
+				</view>
+				<view class="line line3">
+					<view class="lineLeft2">
+						 <span class="linexx">*</span><span>自由参团</span> 
+						 <image  @click="zdct" src="../../static/img/icon_help.png" mode="" class="helpIcon"></image>
+					</view>
+					<view class="lineRight"><switch :checked='groupRestrictions' @change="switchgroupRestrictions" style="transform:scale(0.8)"/></view>
+				</view>
+			</view>
+		
+		</view>
+		
+		
 	  </view>
 	  <view class="kk"></view>
 	  <view class="box">
@@ -180,6 +233,12 @@
 				money:'',
 				ckMusic:'',
 				id:'',
+				groupNumber:'',
+				groupType:false,
+				groupTime:'',
+				groupMoney:'',
+				groupOutState:false,
+				groupRestrictions:false,
 			}
 		},
 		onLoad(opt) {
@@ -211,6 +270,42 @@
 			
 		},
 		methods: {
+		  nopayCl(){
+			  this.payType=2;
+			  this.groupType=false
+		  },
+		  zdct(){
+			  uni.showModal({
+			  	title: '自由参团',
+			  	content: '如果开启自由参团，则用户可以在详情页直接参团；如果关闭，则用户只能通过好友分享的链接参与拼团',
+				showCancel:false,
+				confirmText:'我知道了',
+			  	success: function (res) {
+			  		
+			  	}
+			  });
+		  },
+		  zyct(){
+			 uni.showModal({
+			 	title: '拼团超时自动成团',
+			 	content: '如果开启：过了拼团有效期或拼团活动结束后未能成团，则自动成团；如果关闭：过了拼团有效期或拼团活动结束后未能成团，则拼团失败，团内用户的支付金额将原路退回。',
+				showCancel:false,
+				confirmText:'我知道了',
+			 	success: function (res) {
+			 		
+			 	}
+			 }); 
+		  },
+		  switchgroupType(e){
+			  console.log(e)
+			  this.groupType=e.detail.value
+		  },
+		  switchgroupOutState(e){
+		  		this.groupOutState=e.detail.value
+		  },
+		  switchgroupRestrictions(e){
+                this.groupRestrictions=e.detail.value
+		  },
 		  previewImage(img){
 			  var arr=[]
 			  arr.push(img)
@@ -244,6 +339,7 @@
 					this.endTime=jkdata.endTime.slice(0,10);
 					this.payType=jkdata.payType;
 					this.img=res.data.img.img;
+					
 					if(res.data.imgList){
 						res.data.imgList.forEach(item=>{
 							this.imgListArr.push(item.img)
@@ -274,7 +370,12 @@
 					}else{
 						uni.removeStorageSync('ckmusic');
 					}
-					
+					this.groupType=jkdata.groupType==1?true:false;
+					this.groupNumber=jkdata.groupNumber;
+					this.groupTime=jkdata.groupTime;
+					this.groupMoney=jkdata.groupMoney;
+					this.groupOutState=jkdata.groupOutState;
+					this.groupRestrictions=jkdata.groupRestrictions;
 					//console.log(this.imgListArr)
 					uni.setStorage({
 							key: 'shopckList',
@@ -391,8 +492,56 @@
 					 duration: 2000
 				});
 				return false;
+			}else if(this.groupType){
+				if(!this.groupNumber){
+					
+					uni.showToast({
+						 title: '请输入拼团人数',
+						 icon:'none',
+						 duration: 2000
+					});
+					return false;
+				}else if(this.groupNumber%1 != 0){
+					uni.showToast({
+						 title: '请输入整数',
+						 icon:'none',
+						 duration: 2000
+					});
+					return false;
+				}
+				if(!this.groupTime){
+					uni.showToast({
+						 title: '请输入拼团有效期',
+						 icon:'none',
+						 duration: 2000
+					});
+					return false;
+				}else if(this.groupTime<0.5||this.groupTime>72){
+					uni.showToast({
+						 title: '有效期为0.5小时至72小时',
+						 icon:'none',
+						 duration: 2000
+					});
+					return false;
+				}
+				if(!this.groupMoney){
+					uni.showToast({
+						 title: '请输入价格',
+						 icon:'none',
+						 duration: 2000
+					});
+					return false;
+				}else if(this.groupMoney>this.money){
+					uni.showToast({
+						 title: '拼团价格需小于实付价格',
+						 icon:'none',
+						 duration: 2000
+					});
+					return false;
+				}
 			}
 			//return false;
+			
 			var editdata={
 				id:this.id,
 				activityName:this.activityName,
@@ -408,9 +557,15 @@
 				img:this.img,
 				imgList:this.imgListArr.join(','),
 				clState:'',
-				
+				groupType:this.groupType?1:0,
+				groupNumber:this.groupNumber,
+				groupTime:this.groupTime,
+				groupMoney:this.groupMoney,
+				groupOutState:this.groupOutState?1:0,
+				groupRestrictions:this.groupRestrictions?1:0
 			} 
 			console.log(editdata)
+			//return false;
 			uni.setStorage({
 					key: 'editdata',
 					data: editdata,
@@ -520,6 +675,12 @@
 	min-height: 100vh;
 	background:#F4F5F7;
 }
+.lineLeft2{
+	width: 300rpx;color: #666666;display: flex;align-items: center;
+}
+.helpIcon{
+	width: 26rpx;height: 26rpx;padding-left: 10rpx;padding-top: 4rpx;
+}
 .preview{
 	width: 750rpx;
 	height: 98rpx;
@@ -695,6 +856,11 @@
 	color:#3C3C3C ;
 	width: 500rpx;
 }
+.linecInput{
+	font-size: 28rpx;
+	color:#3C3C3C ;
+	width: 400rpx;
+}
 .lineRight{
 	color:#3C3C3C ;
 }
@@ -723,4 +889,11 @@
 .lineBorderNo{
 	border-bottom: none !important;
 }
+.line3{
+	display: flex;justify-content: space-between;
+	padding: 16rpx 24rpx;
+}
+.line3 .lineLeft{
+	display: flex;align-items: center;
+}
 </style>

pages/addjk/jkDetail.vue

@@ -353,6 +353,7 @@
 	.shopName{
 		color: #3C3C3C;
 		font-size: 28rpx;
+		width: 500rpx;
 	}
 	.shopaddress{
 		font-weight: 400;

pages/myOrder/activityOrderDetail.vue

@@ -26,7 +26,7 @@
 				<view class="SheetState" v-if="orderData.data.sheetState == 2">待服务</view>
 				<view class="SheetState" v-if="orderData.data.sheetState == 3">已完成</view>
 				<view class="SheetState" v-if="orderData.data.sheetState == 4">已取消</view>
-
+                <view class="SheetState" v-if="orderData.data.sheetState == 5">待成团</view>
 			</view>
 
 
@@ -95,7 +95,7 @@
 					</view>
 
 					<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMa=true"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
 				</view>
 			</view>
 
@@ -194,12 +194,19 @@
 
 		</view>
 		<!-- 待服务 -->
-		<view class="bottom" v-if="orderData.data.sheetState == 2">
+		<view class="bottom" v-if="orderData.data.sheetState == 2&&!orderData.data.groupType">
 			<view v-if="(iOSInfo.indexOf('Q030')!=-1||!iOSInfo) && (orderData.data.payType==2) && (orderData.data.writeoffState==1)" class="cancel" @click="cancelBespeak">取消订单</view>
 			<view v-if="(iOSInfo.indexOf('Q031')!=-1||!iOSInfo) && (orderData.data.payType==1) && (orderData.data.payState==2)" class="defer" @click="isShowTui=true">退款</view>
 			<view v-if="iOSInfo.indexOf('Q032')!=-1||!iOSInfo" class="defer" @click="goHeXiao">核销</view>
 
 		</view>
+		<view class="bottom" v-if="orderData.data.sheetState == 2&&orderData.data.groupType">
+			 <view class="cancel" @click="cancelOrder">退款</view>
+			 <view v-if="iOSInfo.indexOf('Q032')!=-1||!iOSInfo" class="defer" @click="goHeXiao">核销</view>
+		</view>
+		<view class="bottom" v-if="orderData.data.sheetState == 5">
+		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType">退款</view>
+		</view>
 
 
 		<!-- 券码 -->
@@ -351,8 +358,14 @@
 
 
 		methods: {
+			isShowMaSHow(){
+				 this.isShowMa=true
+			},
 			getAndroid(e){
 				this.iOSInfo=e		
+			},
+			cancelOrder(){
+				this.isShowTui=true
 			},
 			goTui() {
 			

pages/myOrder/mallOrderDetail.vue

@@ -92,7 +92,7 @@
 					</view>
 
 					<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMa=true"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
 				</view>
 			</view>
 
@@ -356,6 +356,9 @@
 
 
 		methods: {
+			isShowMaSHow(){
+				 this.isShowMa=true
+			},
 			getAndroid(e){
 				this.iOSInfo=e		
 			},

pages/myOrder/myOrder.vue

@@ -28,6 +28,7 @@
 			<view class="tab">
 				<view class="tabLine" :class="{tabActive:tabIndex==0}" @click="tabClick(0)">全部</view>
 				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">待付款</view>
+				<view class="tabLine" :class="{tabActive:tabIndex==5}" @click="tabClick(5)">待成团</view>
 				<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">待服务</view>
 				<view class="tabLine" :class="{tabActive:tabIndex==3}" @click="tabClick(3)">已完成</view>
 			
@@ -49,6 +50,7 @@
 					<view class="itemSheetState orangeColor" v-if="item.SheetState==2">待服务</view>
 					<view class="itemSheetState greenColor" v-if="item.SheetState==3">已完成</view>
 					<view class="itemSheetState" v-if="item.SheetState==4">已取消</view>
+					<view class="itemSheetState redColor" v-if="item.SheetState==5">待成团</view>
 
 				</view>
 				<view class="itemShopBg">
@@ -70,9 +72,9 @@
 			  <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==2}" @click="typeLineCk(2)">集客订单</view>
-				  <view class="typeLine" :class="{typeactive:typeLineIndex==3}" @click="typeLineCk(3)">救援订单</view>
-				  <view class="typeLine":class="{typeactive:typeLineIndex==4}" @click="typeLineCk(4)">钣喷订单</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 class="screenBt">门店</view>
 			  <view class="">
@@ -96,8 +98,8 @@
 						</picker>
 			   </view>
 			   <view class="screenBottom">
-				   <view class="screenCz">重置</view>
-				   <view class="screenY">确定</view>
+				   <view class="screenCz" @click="resetting">重置</view>
+				   <view class="screenY" @click="sub">确定</view>
 			   </view>
 		  </view>
 		</view>
@@ -119,11 +121,13 @@
 				name:'',
 				pickerindex:0,
 				pickerarray: [],
-				screenSHow:true,
+				screenSHow:false,
 				shopName:'',
 				date1:'',
 				date2:'',
 				typeLineIndex:0,
+				sheetTypeList:'',
+				shopId:'',
 			}
 		},
 		onLoad(opt) {
@@ -141,8 +145,25 @@
 		},
 		
 		methods: {
+			sub(){
+				this.screenSHow=false;
+				this.getData();
+			},
+			resetting(){
+				this.date1='';
+				this.date2='';
+				this.typeLineIndex='';
+				this.shopName='';
+				this.shopId='';
+				this.sheetTypeList=''
+			},
 			typeLineCk(num){
 				this.typeLineIndex=num;
+				if(num==1){
+					this.sheetTypeList='1,2,3'
+				}else{
+					this.sheetTypeList=num
+				}
 			},
 			screenSHowBtn(){
 				this.screenSHow=true;
@@ -160,10 +181,11 @@
 			bindPickerChange(e){
 				console.log(e)
 				this.shopName=this.pickerarray[e.detail.value].shopName
+				this.shopId=this.pickerarray[e.detail.value].id
 			},
 			getShopinfo(){
 				this.$http('openH5SetTheGuest/getShopInfo',{},'GET').then(res => {
-						this.shopName=res.data.shopName;
+						//this.shopName=res.data.shopName;
 						
 				 })
 			},
@@ -233,7 +255,11 @@
 					page: this.page,
 					limit: 10,
 					sheetState: this.tabIndex > 0 ? this.tabIndex : '',
-					name:this.name
+					name:this.name,
+					starCreateTime:this.date1,
+					endCreateTime:this.date2,
+					sheetType:this.sheetTypeList,
+					shopName:this.shopId,
 				}
 
 				this.$http('openH5Indent/getOpenSheetList', padata, 'GET').then(res => {
@@ -384,6 +410,7 @@
 	}
 	.searchInput{
 		font-size: 28rpx;padding-left: 16rpx;height: 72rpx;line-height: 72rpx;
+		width: 500rpx;
 	}
 	.box {
 		min-height: 100vh;