集客

pages/activity/jkDetail.vue

@@ -4,6 +4,23 @@
 		<view class="top">
 			<img :src="mainImg" alt="" class="topimg" mode="widthFix">
 		</view>
+		<view class="newtimeTbox" v-if="!activityEnd&&!activityNoOpen">
+			<view class="newtimedjs" >
+			 <!-- <view class="timeviewTxt" v-if="activityNoOpen"> 距开始</view>
+			  <view class="timeviewTxt" v-if="!activityNoOpen"> 距结束</view> -->
+			  <view class="timeK">{{shengyuD}}</view>
+			  <view class="timeviewTxt" > 天</view>
+			  <view class="timeK">{{shengyuH}}</view>
+			  <view class="timeviewTxt"> 时</view>
+			  <view class="timeK">{{shengyuM}}</view>
+			  <view class="timeviewTxt" > 分</view>
+			</view>
+		</view>
+		
+		
+		<view class="zhongjian">
+			
+		
 		<view class="cont" v-if="info">
 			<view class="name">  
 			  <view class="ptNameBz" v-if="info.groupType">
@@ -125,35 +142,56 @@
 			
 		</view>
 		<!-- 多少人报名 -->
-		<view class="signupBox" v-if="info.signUserList.length">
-			<view class="signupTop">
+		<view class="signupBox cyBox" v-if="info.signUserList.length">
+			<!-- <view class="signupTop">
 				<span class="signupTops1">{{info.sumNum}}</span>
 				<span class="signupTops1">人已报名</span>
+			</view> -->
+			<view class="canyuBox">
+				<view class="canyud"></view>
+				<view class="canyuTxt">已有</view>
+				<view class="canyuTxt2">{{info.sumNum}}</view>
+				<view class="canyuTxt">人参与</view>
+				<view class="canyud"></view>
 			</view>
+			
+			
 			<view class="signupCont">
+				<view class="signupContTop">
+					<view class="signupLineLName signupContTopView">用户</view>
+					<view class="signupLineM signupContTopView">车牌号码</view>
+					<view class="signupLineR signupContTopView">购买时间</view>
+				</view>
 				<view class="signupLine" v-for="(item,index) in info.signUserList">
 					<view class="signupLineL">
-						<img :src="item.headImg" alt="" class="signupLineLImg">
+						<!-- <img :src="item.headImg" alt="" class="signupLineLImg"> -->
 						<view class="signupLineLName" v-if="item.nickName!='null'">{{item.nickName?item.nickName:'微信用户'}}</view>
 						<view class="signupLineLName" v-else>微信用户</view>
 					</view>
 					<view class="signupLineM" v-if="item.plateNumber">{{item.plateNumber | maskLicensePlate}}</view>
 					<view class="signupLineR">{{item.signTime}}</view>
 				</view>
+				
+				<view class="signupMore">查看更多</view>
+				
 			</view>
 		</view>
 		<!-- 多少人报名 -->
 		<!-- 多少人看过 -->
-		<view class="signupBox" v-if="info.lookCount">
+		<!-- <view class="signupBox" v-if="info.lookCount">
 			<view class="signupTop">
 				<span class="signupTops1">{{info.lookCount}}</span>
 				<span class="signupTops1">人看过</span>
-			</view>
+			</view> -->
 			<!-- <view class="seeBox">
 				<view class="seeLine" v-for="(item,index) in 15">
 					<img src="http://dmsphoto.66km.com.cn/marketing//accompany/3885B510-6405-4A5E-BD64-B6C09CEE070E.jpg" alt="" class="signupLineLImg">
 				</view>
 			</view> -->
+		<!-- </view> -->
+		<view class="weiguanbox" v-if="info.lookCount">
+			<view class="weiguanTxt">正在围观（{{info.lookCount}}人）</view>
+		</view>
 		</view>
 		<view class="detailBOx" v-if="dimgList.length>0">
 			<view class="detailTitle">活动详情</view>
@@ -165,7 +203,7 @@
 		<view style="height: 200rpx;padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);"></view>
 		<view class="bottom">
-			<view class="timeTbox" v-if="!activityEnd">
+			<!-- <view class="timeTbox" v-if="!activityEnd">
 			  <view class="timeviewTxt" v-if="activityNoOpen"> 距开始</view>
 			  <view class="timeviewTxt" v-if="!activityNoOpen"> 距结束</view>
 			  <view class="timeK">{{shengyuD}}</view>
@@ -174,12 +212,18 @@
 			  <view class="timeviewTxt"> 时</view>
 			  <view class="timeK">{{shengyuM}}</view>
 			  <view class="timeviewTxt" > 分</view>
-			</view>
+			</view> -->
 			<view class="bottomBtnBox">
-				<view class="bottomBtnBoxLeft" @click="shareShowzs">
+				<view class="bottomBtnBoxLeft" @click="shareShowzs" style="padding-left: 26rpx;">
 					<image src="../../static/timg/share.png" alt="" class="shareIcon"></image>
 					<view class="shareTxt">分享</view>
 				</view>
+				<view class="bottomBtnBoxLeft" @click="goOrder">
+					<image src="../../static/timg/jkdingdan.png" alt="" class="shareIcon"></image>
+					<view class="shareTxt">订单</view>
+				</view>
+				<view class="fxHb2" @click="gowp" v-if="info.state==2&&info.groupType==1">推广海报</view>
+				<view v-else @click="gowp"  class="fxHb">推广海报</view>
 				<!-- <button open-type="share" class="bottomBtnBoxLeft shareBtn" >
 					<image src="../../static/timg/share.png" mode="" class="shareIcon"></image>
 					<view class="shareTxt">分享</view>
@@ -371,7 +415,7 @@
 			</view>
 		</view>
 		<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>
+		<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">
@@ -493,6 +537,8 @@
 				 	lng: '',
 				 	lat: '',
 				 },
+				 coverimg:'',
+				 photoimg:'',
 			}
 		},
 		onLoad(opt) {
@@ -658,8 +704,31 @@
 				}
 				//console.log(sellingPoint)
 				this.shareShow=false;
+				
+				var title=''
+				if(this.info.shareWords){
+					title=this.info.shareWords
+				}else{
+					title= this.info.activityName
+				}
+				var img='';
+				if(this.photoimg){
+					img=this.photoimg
+				}else if(this.mainImg){
+					img=this.mainImg
+				}else{
+					img="http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png"
+				}
+				
+				
+				
+				uni.navigateTo({
+					url:'../shop/wp?img='+img+'&name='+title+'&time='+time+'&sellingPoint='+sellingPoint+'&id='+this.collectingID+'&type=2'+'&groupType='+this.info.groupType
+				})
+			},
+			goOrder(){
 				uni.navigateTo({
-					url:'../shop/wp?img='+this.mainImg+'&name='+this.info.activityName+'&time='+time+'&sellingPoint='+sellingPoint+'&id='+this.collectingID+'&type=2'+'&groupType='+this.info.groupType
+					url: '../user/myOrder/myOrder?num=0'
 				})
 			},
 			shareShowyc(){
@@ -1017,6 +1086,13 @@
 							}else{
 								this.dimgList.push(item)
 							}
+							if(item.imgType==3){
+								this.coverimg=item.img
+							}
+							if(item.imgType==4){
+								this.photoimg=item.img
+							}
+							
 						})
 					}
 					if (this.info.endTime < this.info.startTime) {
@@ -1137,9 +1213,10 @@
 					
 			},
 			call() {
-				uni.makePhoneCall({
+			   uni.makePhoneCall({
 					phoneNumber: this.shopInfo.mobilePhone
-				});
+				}); 
+				
 			},
 			getmap() {
 				console.log("打开地图")
@@ -1313,7 +1390,9 @@
 		onShareAppMessage(res) {
 			console.log(res)
 			var img='';
-			if(this.mainImg){
+			if(this.coverimg){
+				img=this.coverimg
+			}else if(this.mainImg){
 				img=this.mainImg
 			}else{
 				img="http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png"
@@ -1329,8 +1408,15 @@
 				var url= 'pages/activity/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId
 			}
 			
+			var title=''
+			if(this.info.shareWords){
+				title=this.info.shareWords
+			}else{
+				title= this.info.activityName
+			}
+			
 			return {
-				title: this.info.activityName,
+				title: title,
 				imageUrl:img,
 				//imageUrl:this.mainImg,
 				//imageUrl:'http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png',
@@ -1358,10 +1444,24 @@
 			}else{
 				var url= 'id=' + this.collectingID+'&shareId='+this.userInfo.openId
 			}
+			var title=''
+			if(this.info.shareWords){
+				title=this.info.shareWords
+			}else{
+				title= this.info.activityName
+			}
+			var img='';
+			if(this.coverimg){
+				img=this.coverimg
+			}else if(this.mainImg){
+				img=this.mainImg
+			}else{
+				img="http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png"
+			}
 		    return {
-		      title: this.info.activityName,
+		      title: title,
 		      query:url,
-			  imageUrl:'http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png',
+			  imageUrl:img,
 		    }
 		  }
 		
@@ -1432,9 +1532,11 @@ color: #FFFFFF;font-size: 26rpx;
 }
 .ptBox{
 	background: #ffffff;margin-top: 20rpx;
+	border-radius: 20rpx;
 }
 .bottomPtBox{
-	display: flex;padding-top: 24rpx;
+	display: flex;margin-top: 24rpx;
+	padding-left: 20rpx;
 }
 .ptNum{
 	font-weight: 400;
@@ -1449,12 +1551,12 @@ color: #FFFFFF;font-size: 26rpx;
 	color: #666666;font-size: 24rpx;
 }
 .separate{
-	width: 284rpx;margin-left: 30rpx;
-	height: 70rpx;
-	/* background: #ffe1f1; */
-	border-radius: 37rpx;
+	width: 182rpx;
+	height: 84rpx;
+	
 	text-align: center;color:#EC0F0A;
 	border: 2rpx solid #EC0F0A;
+	border-radius: 16rpx 0rpx 0rpx 16rpx;
 }
 .separate .separateTop{
 	color:#EC0F0A;
@@ -1463,14 +1565,14 @@ color: #FFFFFF;font-size: 26rpx;
 	color:#EC0F0A;
 }
 .groupBtn{
-	width: 284rpx;text-align: center;color: #ffffff;
-	height: 74rpx;margin-left: 30rpx;
+	width: 182rpx;
+	height: 88rpx;text-align: center;color: #ffffff;
 	background: #EC0F0A;
-	border-radius: 37rpx;
+	border-radius: 0rpx 16rpx 16rpx 0rpx;
 }
 .separateTop{
 	font-weight: 500;font-size: 28rpx;
-	color: #FFFFFF;padding-top: 2rpx;
+	color: #FFFFFF;padding-top: 10rpx;
 }
 .separateTxt{
 	color: #FFFFFF;font-size: 26rpx;line-height: 26rpx;
@@ -1520,10 +1622,11 @@ color: #FFFFFF;font-size: 26rpx;
 	.mp3Img{
 	 /* transform: translate(-1584.4%, 121.5%) scale(1); */
 	  position: fixed;
-	  top: 40rpx;
+	  top:200rpx;
 	  right: 40rpx;
 	  width: 60rpx;
 	  height: 60rpx;
+	  z-index: 111;
 	}
 	.ckshopBox{
 		z-index: 111 !important;
@@ -1646,23 +1749,23 @@ color: #FFFFFF;font-size: 26rpx;
 		text-align: center;
 	}
 	.bottomBtn{
-		width: 598rpx;
-		height: 74rpx;
-		background: #EC0F0A;
-		border-radius: 37rpx;
-		line-height: 74rpx;
+		width: 259rpx;
+		height: 88rpx;
+		background: linear-gradient( 136deg, #FE7C58 0%, #FF415C 100%), #EC0F0A;
+		border-radius: 16rpx;
+		line-height: 88rpx;
 		text-align: center;
 		color: #ffffff;
 		font-size: 30rpx;
 		margin-top: 24rpx;
-		margin-left: 34rpx;
+		margin-left: 24rpx;
 	}
 	.bottomBtn2{
-		width: 598rpx;
-		height: 74rpx;
+		width: 259rpx;
+		height: 88rpx;
 		background: #DDDDDD;
 		border-radius: 37rpx;
-		line-height: 74rpx;
+		line-height: 88rpx;
 		text-align: center;
 		color: #ffffff;
 		font-size: 30rpx;
@@ -1705,7 +1808,7 @@ color: #FFFFFF;font-size: 26rpx;
 	}
 .bottom{
 	width: 750rpx;
-	height: 180rpx;
+	height: 90rpx;
 	background: #FFFFFF;
 	border-radius: 24rpx 24rpx 0px 0px;
 	position: fixed;
@@ -1731,8 +1834,11 @@ color: #FFFFFF;font-size: 26rpx;
 .signupLine{
  display: flex;
  justify-content: space-between;
- padding: 11rpx 0;
- border-bottom: 1px solid #DDDDDD;
+ padding: 11rpx 24rpx;
+ /* border-bottom: 1px solid #DDDDDD; */
+}
+.signupLine:nth-child(even){
+	background: #FDFAF8;
 }
 .signupLineM{
 	color: #3C3C3C;font-size: 26rpx;
@@ -1755,7 +1861,7 @@ color: #FFFFFF;font-size: 26rpx;
 	text-overflow:ellipsis;
 }
 .signupCont{
-	padding: 0 24rpx;
+	/* padding: 0 24rpx; */
 }
 .signupLineLImg{
 	width: 56rpx;
@@ -1849,6 +1955,7 @@ color: #FFFFFF;font-size: 26rpx;
 		background: #ffffff;
 		margin-top: 20rpx;
 		padding: 20rpx 24rpx;
+		border-radius: 20rpx;
 	}
 	.shopBoxTop{
 		display: flex;
@@ -1871,10 +1978,11 @@ color: #FFFFFF;font-size: 26rpx;
 	}
 	.cont{
 		background: #ffffff;
-		border-radius: 24rpx 24rpx 0px 0px;
-		margin-top: -30rpx;
+		/* border-radius: 24rpx 24rpx 0px 0px; */
+		/* margin-top: -30rpx; */
 		padding: 30rpx 24rpx;
 		position: relative;
+		border-radius: 20rpx;
 	}
 	.name{
 		color: #3C3C3C;
@@ -2096,7 +2204,7 @@ color: #FFFFFF;font-size: 26rpx;
 		}
 		.groupBtnTop{
 			font-weight: 500;font-size: 28rpx;
-			color: #FFFFFF;padding-top: 2rpx;
+			color: #FFFFFF;padding-top: 10rpx;
 		}
 		.couponPackageData{
 			background: #ffffff;
@@ -2283,4 +2391,126 @@ color: #FFFFFF;font-size: 26rpx;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+
+
+.canyuBox{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	
+}
+.cyBox{
+	border-radius: 20rpx;
+}
+.canyud{
+	width: 6rpx;
+	height: 6rpx;
+	background: #9A2300;
+	border-radius: 3rpx;
+	margin-top: 2rpx;
+}
+.canyuTxt{
+	font-size: 30rpx;
+	color: #9A2300;
+	padding: 0 10rpx;
+}
+.canyuTxt2{
+	font-weight: 600;
+	font-size: 52rpx;
+	color: #EC0F0A;
+	/* padding: 0 10rpx; */
+}
+.signupContTop{
+	display: flex;justify-content: space-between;
+	padding-bottom: 20rpx;
+	padding-left: 24rpx;
+	padding-right: 24rpx;
+}
+.signupContTop .signupContTopView{
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #999999;
+	line-height: 33rpx;
+}
+.signupContTop .signupLineR{
+	width: 260rpx;
+	text-align: right;
+}
+.signupMore{
+	width: 300rpx;
+	height: 64rpx;
+	border-radius: 10rpx;
+	border: 2rpx solid #9A2300;
+	font-size: 28rpx;
+	color: #9A2300;
+	text-align: center;
+	line-height: 64rpx;
+	margin: 0 auto;
+	margin-top: 20rpx;
+}
+.cyBox{
+	padding-bottom: 30rpx;
+}
+.weiguanbox{
+	background: #ffffff;
+	margin-top: 20rpx;
+	padding: 28rpx 24rpx;
+	border-radius: 20rpx;
+}
+.zhongjian{
+	padding: 20rpx 24rpx;
+}
+.newtimeTbox{
+	width: 100%;
+	height: 102rpx;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/8F583E30-E4E0-43EB-8C4B-1A9A240F1F89.png');
+	background-size: 100% 100%;
+}
+.newtimedjs{
+	display: flex;
+	padding-left: 510rpx;
+	padding-top: 34rpx;
+}
+.newtimedjs .timeK{
+	width: 46rpx;
+	height: 44rpx;
+	background: #303030;
+	border-radius: 9rpx;
+	text-align: center;
+	line-height: 44rpx;
+	margin-left: 2rpx;
+	margin-right: 10rpx;
+}
+.newtimedjs .timeviewTxt{
+	font-weight: 400;
+	font-size: 20rpx;
+	color: #E96A4F;
+	padding-top: 18rpx;
+}
+.fxHb{
+	width: 259rpx;
+	height: 88rpx;
+	background: #FEDFCB;
+	border-radius: 16rpx;
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #9A2300;
+	text-align: center;
+	line-height: 88rpx;
+	margin-left: 25rpx;
+	margin-top: 24rpx;
+}
+.fxHb2{
+	width: 154rpx;
+	height: 88rpx;
+	background: #FEDFCB;
+	border-radius: 16rpx;
+	font-weight: 500;
+	font-size: 30rpx;
+	color: #9A2300;
+	text-align: center;
+	line-height: 88rpx;
+	margin-left: 25rpx;
+	margin-top: 24rpx;
+}
 </style>

pages/index/index.vue

@@ -1713,6 +1713,9 @@
 		},
 	   onShareAppMessage(){
 		   
+	   },
+	   onShareTimeline(){
+		   
 	   }
 	}
 </script>

pages/shop/shop.vue

@@ -157,6 +157,10 @@
 				
 		},
 		onLoad(opt) {	
+			/* uni.showShareMenu({
+					withShareTicket: true,
+					menus: ["shareAppMessage", "shareTimeline"]
+				}) */
 			console.log(getApp().globalData.shopcategoryID)
 			//this.userInfo = uni.getStorageSync("userInfo");
 			/* this.shopcategoryID=getApp().globalData.shopcategoryID;

pages/user/historySpend.vue

@@ -11,7 +11,7 @@
 			</picker>
 		</view>
 		<view style="height: 90rpx;"></view>
-		 <!-- <view @click="goBj('7DF3D27B-A80C-4D76-9354-5B9AFD788CFC')">白玉静测试数据1</view>
+	    <!-- <view @click="goBj('7DF3D27B-A80C-4D76-9354-5B9AFD788CFC')">白玉静测试数据1</view>
 		<view @click="goBj('EF16F1B6-E1FB-46EC-A626-94A7B1FB4B1C')">白玉静测试数据2</view> 
 		<view @click="goBj('76D923FE-F360-477D-8B0D-45DF13E67AFA')">白玉静测试数据3</view> -->
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item)">

pages/user/user.vue

@@ -525,6 +525,18 @@
 		</view>
 		
 		<view class="releaseVersion">版本号：{{release_version}}</view>
+		
+		
+		<!-- <view class="rowBox" @click="gonavigateTo('../report/complete?id=278569FB-6F21-47AD-8B66-D62D2EA6981D')">
+			<view class="leftView">
+				<image src="../../static/img/icon_kehuzhuanjieshao.png" mode="" class="liftIcon"></image>
+				<view class="rowTitle">完工报告</view>
+			</view>
+			<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+		</view> -->
+		
+		
+		
 
 		<!-- <view class="signOut" @click="signOut">退出登录</view> -->
 		<!-- 手机号授权 -->

utils/request.js

@@ -8,8 +8,8 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-const baseUrl=extConfig.url+'/'
-//const baseUrl='http://api2.dms.66km.com.cn/'
+//const baseUrl=extConfig.url+'/'
+const baseUrl='http://api2.dms.66km.com.cn/'
 //const baseUrl='http://dms.66km.com.cn/'
 //const baseUrl='http://192.168.1.14:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'