11

pages/activity/jkDetail.vue

@@ -4,13 +4,13 @@
 		<view class="top">
 			<img :src="mainImg" alt="" class="topimg" mode="widthFix">
 		</view>
-		<view class="cont">
+		<view class="cont" v-if="info">
 			<view class="name">{{info.activityName}}</view>
-			<view class="name2">{{info.startTime.slice(0,10)}}~{{info.endTime.slice(0,10)}}</view>
+			<view class="name2">{{info.startTime.slice(0,10)}}~{{info.endTime.slice(0,10)}}</view> 
 			<view class="name3">{{info.activityContent}}</view>
 		</view>
 		<!-- 拼团 -->
-		<view class="ptBox" v-if="info.groupList.length>0">
+		<view class="ptBox" v-if="info.groupList&&info.groupList.length>0">
 			<view class="ptBoxtop">
 				<view class="ptNum">{{info.groupList.length}}人正在拼团，可直接参与</view>
 				<view class="ptMore">
@@ -25,7 +25,11 @@
 						<view class="DiffBNumber">还差 <span>{{item.DiffBNumber}}人</span>拼成 </view>
 						<view class="ptdjs">剩余{{item.EndTime | limitTimeFilter }}</view><!-- | limitTimeFilter -->
 					</view>
-					<view class="ptBtn" @click="join(item)">{{item.IfMyself?'邀请好友':'去拼团'}} </view>
+					
+					 <button open-type="share" class=" shareBtn" :data-obj="item"  v-if="item.IfMyself">
+					    <view class="ptBtn" >邀请好友 </view>
+					</button>
+					<view class="ptBtn" @click="join(item)" v-else>去拼团 </view>
 				</view>
 			</view>
 		</view>
@@ -45,12 +49,12 @@
 				</view>
 				<view class="shopContRight">
 					<view class="shopContRightLine" @click="getmap">
-						<img src="../../static/timg/icon_map.png" alt="" class="shopRightIcon">
+						<image src="../../static/timg/icon_map.png" alt="" class="shopRightIcon"></image>
 						<view class="shopRightTxt">地图</view>
 					</view>
 					<view class="shopRightSx"></view>
 					<view class="shopContRightLine" @click="call">
-						<img src="../../static/timg/icon_phone.png" alt="" class="shopRightIcon">
+						<image src="../../static/timg/icon_phone.png" alt="" class="shopRightIcon"></image>
 						<view class="shopRightTxt">电话</view>
 					</view>
 				</view>
@@ -110,7 +114,7 @@
 			</view>
 			<view class="bottomBtnBox">
 				<view class="bottomBtnBoxLeft" @click="shareShowzs">
-					<img src="../../static/timg/share.png" alt="" class="shareIcon">
+					<image src="../../static/timg/share.png" alt="" class="shareIcon"></image>
 					<view class="shareTxt">分享</view>
 				</view>
 				<!-- <button open-type="share" class="bottomBtnBoxLeft shareBtn" >
@@ -128,8 +132,8 @@
 						<view class="separateTxt">单独购买</view>
 					</view>
 					<view class="groupBtn" @click="groupFn">
-						<view class="separateTop">￥{{info.groupMoney}}</view>
-						<view class="separateTxt">发起拼团</view>
+						<view class="groupBtnTop">￥{{info.groupMoney}}</view>
+						<view class="groupBtnTxt">发起拼团</view>
 					</view>
 				</view>
 				<view class="bottomBtn2" v-if="info.state==1">报名未开始</view>
@@ -141,13 +145,13 @@
 			<view class="baomingCont applicationTk" @click.stop="" :style="{bottom: jpHeight}">
 				<view class="bmTop">
 					<view class="bmTitle">登记信息</view>
-					<img src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="nobmshow">
+					<image src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="nobmshow"></image>
 				</view>
 				<view style="padding: 0 24rpx;">
 					<view class="bmshopLine" @click="showCkshop">
 						<view class="bmshopname" v-if="!shopName">请选择门店</view>
 						<view class="bmshopname" style="color: #333333;">{{shopName}}</view>
-						<img src="../../static/timg/icon_arrow_right.png" alt="" class="bmshopjt">
+						<image src="../../static/timg/icon_arrow_right.png" alt="" class="bmshopjt"></image>
 					</view>
 					<!-- clWhere报名凭证1,2,3,4 1手机号2车牌号3姓名4单位 -->
 					<view class="bmLine" v-if="info.clWhere.indexOf(1)!=-1" @click="focusState1cl">
@@ -166,9 +170,14 @@
 				<view class="bmTtnBox">
 					<view style="height: 1rpx;"></view>
 					<view class="bmBtn" @click="submitOrder" :style="{background:'#'+themeColor}">
-						<span v-if="info.payType==1&&info.groupType!=1">￥{{info.money}} &nbsp; 立即抢购</span>
-						<span v-if="info.payType==1&&info.groupType==1">￥{{info.groupMoney}} &nbsp; 立即拼团</span>
-						<span v-else>立即报名</span>
+						<span v-if="groupOwner">
+							￥{{info.groupMoney}} &nbsp; 立即拼团
+						</span>
+						<span v-else>
+							<span v-if="info.payType==1">￥{{info.money}} &nbsp; 立即抢购</span>
+							<span v-else>立即报名</span>
+						</span>
+						
 					</view>
 				</view>
 			</view>
@@ -178,7 +187,7 @@
 			<view class="baomingCont">
 				<view class="bmTop">
 					<view class="bmTitle">选择门店</view>
-					<img src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="noShowShop">
+					<image src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="noShowShop"></image>
 				</view>
 				<view style="padding: 0 24rpx; height: 65vh;overflow-y: scroll;">
 					<view class="ckshopLine" v-for="(item,index) in info.shopList" @click="ckshop(item)">
@@ -212,7 +221,7 @@
 			<view class="baomingCont" @click.stop="">
 				<view class="bmTop">
 					<view class="bmTitle">选择门店</view>
-					<img src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="noShowShop2">
+					<image src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="noShowShop2"></image>
 				</view>
 				<view style="padding: 0 24rpx; height: 65vh;overflow-y: scroll;">
 					<view class="ckshopLine" v-for="(item,index) in info.shopList"  @click="ckshop(item)">
@@ -241,8 +250,8 @@
 				
 			</view>
 		</view>
-		<img src="../../static/timg/mp3.png" class="mp3Img" @click="play()" v-if="!payshow&mp3Url!=''">
-		<img src=".../../static/timg/mp31.png" class="mp3Img" @click="play2()" id="bofang" v-if="payshow&mp3Url!=''">
+		<image src="../../static/timg/mp3.png" class="mp3Img" @click="play()" v-if="!payshow&mp3Url!=''"></image>
+		<image src=".../../static/timg/mp31.png" class="mp3Img" @click="play2()" id="bofang" v-if="payshow&mp3Url!=''"></image>
 		
 		<view class="shareBox" v-if="shareShow" @click="shareShowyc">
 			   <img :src="shareQrCode" alt=""style="width: 300rpx;height:300rpx">
@@ -275,7 +284,7 @@
 			<view class="djsCont">
 				<view class="bmTop">
 					<view class="bmTitle">12人正在拼单，可直接参与</view>
-					<img src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="noShowShop2">
+					<image src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="noShowShop2"></image>
 				</view>
 				<view class="djsLineBox">
 					<view class="ptLine" v-for="(item,index) in info.groupList">
@@ -285,7 +294,10 @@
 								<view class="DiffBNumber">还差 <span>{{item.DiffBNumber}}人</span>拼成 </view>
 								<view class="ptdjs">剩余{{item.EndTime | limitTimeFilter }}</view><!-- | limitTimeFilter -->
 							</view>
-							<view class="ptBtn" @click="join(item)">{{item.IfMyself?'邀请好友':'去拼团'}} </view>
+							<button open-type="share" class=" shareBtn" :data-obj="item"  v-if="item.IfMyself">
+							    <view class="ptBtn" >邀请好友 </view>
+							</button>
+							<view class="ptBtn" @click="join(item)" v-else>去拼团</view>
 						</view>
 					</view>
 				</view>
@@ -424,16 +436,18 @@
 		
 		methods: {
 			beginTimer() { //这个计时器是每秒减去数组中指定字段的时间
-			
-			  this.ticker = setInterval(() => {
-				 this.info.groupList= JSON.parse(JSON.stringify( this.info.groupList))
-				/* for (let i = 0, len = this.info.groupList.length; i < len; i++) {
-				  const item = this.info.groupList[i];
-				  if (item.EndTime) {
-					
-				  }
-				} */
-			  }, 1000);
+			  if(this.info.groupType){
+				  this.ticker = setInterval(() => {
+					 this.info.groupList= JSON.parse(JSON.stringify( this.info.groupList))
+					/* for (let i = 0, len = this.info.groupList.length; i < len; i++) {
+					  const item = this.info.groupList[i];
+					  if (item.EndTime) {
+						
+					  }
+					} */
+				  }, 1000);
+			  }
+			  
 			},
 			setDate(time) {    
 					var t_s = Date.parse(new Date(time)); //转化为时间戳毫秒数
@@ -610,6 +624,7 @@
 					sheetDetail:JSON.stringify(arr),
 					payType:this.info.payType,
 					shareId:this.shareId,
+					groupType:0,
 				}
 				if(this.groupOwner==1){
 					params.groupOwner=1;
@@ -1008,10 +1023,17 @@
 			/* if(this.info.ImgList.length>0){
 				img=this.info.ImgList[0].url
 			} */
+			if(this.info.groupType){
+				console.log(res.target.dataset.obj.ID)
+				var url= 'pages/subPack/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId+'&groupID='+res.target.dataset.obj.ID+'&shareName='+this.userInfo.nickName
+			}else{
+				var url= 'pages/activity/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId
+			}
+			
 			return {
 				title: this.info.activityName,
 				imageUrl:this.mainImg,
-				path: 'pages/activity/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId,
+				path:url,
 				success(res){
 					uni.showToast({
 						title:'分享成功'
@@ -1714,4 +1736,11 @@ color: #FFFFFF;font-size: 28rpx;
 		.applicationTk{
 			height: 60vh;
 		}
+		.groupBtnTxt{
+			color: #FFFFFF;font-size: 26rpx;
+		}
+		.groupBtnTop{
+			font-weight: 500;font-size: 28rpx;
+			color: #FFFFFF;
+		}
 </style>

pages/subPack/jkDetail.vue

@@ -159,9 +159,13 @@
 				<view class="bmTtnBox">
 					<view style="height: 1rpx;"></view>
 					<view class="bmBtn" @click="submitOrder" :style="{background:'#'+themeColor}">
-						<span v-if="info.payType==1&&info.groupType!=1">￥{{info.money}} &nbsp; 立即抢购</span>
-						<span v-if="info.payType==1&&info.groupType==1">￥{{info.groupMoney}} &nbsp; 立即拼团</span>
-						<span v-else>立即报名</span>
+						<span v-if="groupOwner">
+							￥{{info.groupMoney}} &nbsp; 立即拼团
+						</span>
+						<span v-else>
+							<span v-if="info.payType==1">￥{{info.money}} &nbsp; 立即抢购</span>
+							<span v-else>立即报名</span>
+						</span>
 					</view>
 				</view>
 			</view>
@@ -373,13 +377,19 @@
 				 seeTyshow:false,
 				 ptState:false,
 				 cyptNum:'',
-				 shareOpenID:'o82ym5Hibc2EuO_k5DwudNk17v08',
-				 shareName:'赵锦文的爸爸',
+				 shareOpenID:'',
+				 shareName:'',
 			}
 		},
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			this.groupID="E035EA0C-6095-466F-8580-89E6683FE1FF"
+			if(opt.shareId){
+				this.shareOpenID=opt.shareId;
+				this.shareName=opt.shareName;
+				this.groupID=opt.groupID
+			}
+			
+			//this.groupID="E035EA0C-6095-466F-8580-89E6683FE1FF"
 		   console.log(opt)
 		   if(opt.shareId){
 			   this.shareId=opt.shareId
@@ -641,6 +651,7 @@
 					sheetDetail:JSON.stringify(arr),
 					payType:this.info.payType,
 					shareId:this.shareId,
+					groupType:0,
 				}
 				if(this.groupOwner==1){
 					params.groupOwner=1;
@@ -1036,7 +1047,7 @@
 			  // setTimeout("clock()",500);
 			  this.dh=shengyuH;
 			  this.dm=shengyuM;
-			  this.ds=s;
+			  this.ds=S;
 			  setTimeout(_this.clock3, 500)
 			},
 			decryptPhoneNumber: function(e) {

pages/user/myOrder/activityOrderDetail.vue

@@ -48,7 +48,9 @@
 			<view class="DiffBNumber">还差 <span style="#FF0000">{{orderData.openGroup.groupNumber - orderData.groupList.length}}</span> 人，赶快邀请好友来拼团吧</view>
 		    <view class="ptBtnBox">
 		    	<view class="seeTy" @click="seeTyshowBtn">查看全部团员</view>
-				<view class="yqhypt">邀请好友拼团</view>
+				 <button open-type="share" class=" shareBtn" >
+				     <view class="yqhypt">邀请好友拼团</view>
+				 </button>
 		    </view>
 		</view>
 
@@ -110,8 +112,8 @@
 				<view class="salePrice"><span class="informationNum">￥</span>{{orderData.data.payType==1? item.salePrice:0}}</view>
 			</view>
 			
-			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
-			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4">
+			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4&& orderData.data.sheetState != 5" class="line"></view>
+			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4&& orderData.data.sheetState != 5">
 				<view class="goodsName2">
 					券码信息（{{quanMaList.length?quanMaList.length:0}}张可用）
 				</view>
@@ -197,16 +199,37 @@
 			</view>
 
 		</view>
+		
+		<!-- 核销信息 -->
+		<view class="information" v-if="orderData.data.sheetState == 3">
+			<view class="detailedTitle">核销信息</view>
+			<view class="informationLine">
+				<view class="informationTxt">核销状态：</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==1">未核销</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==2">部分核销</view>
+				<view class="informationNum" v-if="orderData.data.writeoffState==3">已核销</view>
+			</view>
+			
+			<view class="informationLine">
+				<view class="informationTxt">核销时间：</view>
+				<view class="informationNum">{{orderData.data.writeoffTime?orderData.data.writeoffTime:'-'}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">核销门店：</view>
+				<view class="informationNum">{{orderData.data.writeoffName?orderData.data.writeoffName:'-'}}</view>
+			</view>
+		</view>
+		
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
             <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType==1">取消订单</view>
-			<view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType!=1">取消订单</view>
+			<view class="cancel" @click="cancelBespeak" v-if="!orderData.data.groupType">取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
-		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType==1">取消订单</view>
+		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType">取消订单</view>
 		</view>
 
 
@@ -644,6 +667,7 @@
 			  let stopM = startTime.getMinutes()
 			  let stopS = startTime.getSeconds()
 			  let shenyu = startTime.getTime() - today.getTime() // 倒计时毫秒数
+			  //console.log(shenyu)
 			  let shengyuD = parseInt(shenyu / (60 * 60 * 24 * 1000)) // 转换为天
 			 // let D = parseInt(shenyu) - parseInt(shengyuD * 60 * 60 * 24 * 1000)// 除去天的毫秒数
 			  let D = parseInt(shenyu)
@@ -652,13 +676,14 @@
 			  let shengyuM = parseInt(H / (60 * 1000)) // 除去天的毫秒数转换成分钟
 			  let M = H - shengyuM * 60 * 1000// 除去天、小时、分的毫秒数
 			  let S = parseInt((shenyu - shengyuD * 60 * 60 * 24 * 1000 - shengyuH * 60 * 60 * 1000 - shengyuM * 60 * 1000) / 1000)// 除去天、小时、分的毫秒数转化为秒
-			
+			 //console.log(S)
 			 // this.daojishi = '报名倒计时:' + shengyuD + '天' + shengyuH + '小时' + shengyuM + '分' + S + '秒'
 			  // setTimeout("clock()",500);
 			  this.dh=shengyuH;
 			  this.dm=shengyuM;
-			  this.ds=s;
-			  setTimeout(_this.clock, 500)
+			  this.ds=S;
+			 
+			  setTimeout(_this.clock, 1000)
 			},
 			goback() {
 				uni.navigateBack({
@@ -673,12 +698,35 @@
 
 		},
 		onPullDownRefresh() {
-
 			this.getData()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
+		onShareAppMessage(res) {
+			console.log(this.userInfo)
+			var img='';
+			/* if(this.info.ImgList.length>0){
+				img=this.info.ImgList[0].url
+			} */
+			return {
+				title: this.orderData.data.sheetContent,
+				//imageUrl:this.mainImg,
+				path: 'pages/subPack/jkDetail?id=' + this.orderData.openSheetDetail[0].itemId+'&shareId='+this.userInfo.openId+'&groupID='+this.orderData.data.groupID+'&shareName='+this.userInfo.nickName,
+				success(res){
+					uni.showToast({
+						title:'分享成功'
+					})
+				},
+				fail(res){
+					uni.showToast({
+						title:'分享失败',
+						icon:'none',
+						duration: 3000
+					})
+				}
+			}
+		},
 
 	}
 </script>
@@ -1321,4 +1369,28 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		.shopBoxpt{
 			margin-top: 20rpx;
 		}
+		button::after{
+		 	border: none;
+		}
+		button{
+			position: relative;
+			display: block;
+			margin-left: 0;
+			margin-right: 0;
+			padding-left: 0px;
+			padding-right: 0px;
+			box-sizing: border-box;
+			// font-size: 18px;
+			text-align: center;
+			text-decoration: none;
+			// line-height: 1;
+			line-height: 1.35;
+			// border-radius: 5px;
+			-webkit-tap-highlight-color: transparent;
+			overflow: hidden;
+			color: #000000;
+			background-color: #fff;
+			
+			height: 100%;
+			}
 </style>

pages/user/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>
 
@@ -309,7 +309,10 @@
 		},
 		
 
-		methods: {
+		methods: {
+			isShowMaSHow(){
+				 this.isShowMa=true
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code

pages/user/myOrder/myOrder.vue

@@ -18,7 +18,7 @@
 					<view class="itemType" v-if="item.SheetType==4">救援订单</view>
 					<view class="itemType" v-if="item.SheetType==5">钣喷订单</view>
 					<view class="itemType" v-if="item.SheetType==6">集客订单</view>
-
+                    <view class="itemSheetState redColor" v-if="item.SheetState==5">待成团</view>
 					<view class="itemSheetState redColor" v-if="item.SheetState==1">待付款</view>
 					<view class="itemSheetState orangeColor" v-if="item.SheetState==2">待服务</view>
 					<view class="itemSheetState greenColor" v-if="item.SheetState==3">已完成</view>

pages/user/user.vue

@@ -49,6 +49,15 @@
 					</view>
 					<view class="orderLineTxt">待付款</view>
 				</view>
+				<view class="orderLine" @click="goorder(5)">
+					<view class="orderImgBox">
+						<view class="orderNum" v-show="numList.waitGroupSize>0">
+							{{numList.waitGroupSize>99?'99+':numList.waitGroupSize}}
+						</view>
+						<image src="../../static/timg/my_icon_4.png" mode="" class="orderLineImg"></image>
+					</view>
+					<view class="orderLineTxt">待成团</view>
+				</view>
 				<view class="orderLine" @click="goorder(2)">
 					<view class="orderImgBox">
 						<view class="orderNum" v-show="numList.waitServiceSize>0">
@@ -58,6 +67,7 @@
 					</view>
 					<view class="orderLineTxt">待服务</view>
 				</view>
+				
 				<view class="orderLine" @click="goorder(3)">
 					<view class="orderImgBox">
 						<view class="orderNum" v-show="numList.hasOverSize>0">