1.活动

pages/addjk/activity.vue

@@ -51,11 +51,16 @@
 						<view class="more" @click="goEdit(item.ID)">
 							<image src="../../static/img/icon_bianji.png" mode="" class="btnImg"></image>
 							<view class="btn2">编辑</view>
+						</view>
+						<view class="more" @click="open(item)" v-if="item.state=='未启用'">
+							<image src="../../static/img/icon_tingyong.png" mode="" class="btnImg"></image>
+							<view class="btn2">启用</view>
 						</view>
-						<view class="more" @click="stop(item)">
+						<view class="more" @click="stop(item)" v-else>
 							<image src="../../static/img/icon_tingyong.png" mode="" class="btnImg"></image>
 							<view class="btn2">停用</view>
-						</view>
+						</view>
+						
 					</view>
 
 				</view>
@@ -96,7 +101,29 @@
 			this.myOrderCoupon()
 		},
 
-		methods: {
+		methods: {
+			open(item) {
+				var that = this;
+				uni.showLoading({
+					title: '加载中'
+				});
+				that.$http('openH5SetTheGuest/updateAtivitySate', {
+					id: item.ID,
+					clState: 2
+				}, 'POST').then(res => {
+					uni.showToast({
+						title: '成功',
+						icon: 'none',
+						duration: 3000
+					});
+						
+					that.page = 1;
+					that.myOrderCoupon()
+				})
+			
+			
+			
+			},
 			stop(item) {
 
 				var that = this;
@@ -147,17 +174,17 @@
 			goEdit(id) {
 				uni.navigateTo({
 					url: 'eadit?id=' + id
-				 })
+				})
 			},
 			goSign(item) {
 				uni.navigateTo({
 					url: 'signJkDetail?activity=' + JSON.stringify(item)
 				})
-			},
-			goStatis(item){
-				uni.navigateTo({
-					url: 'statistics?activity=' + JSON.stringify(item)
-				})
+			},
+			goStatis(item) {
+				uni.navigateTo({
+					url: 'statistics?activity=' + JSON.stringify(item)
+				})
 			},
 			myOrderCoupon() {
 				uni.showLoading({
@@ -320,6 +347,8 @@
 		height: 280rpx;
 		width: 702rpx;
 		border-radius: 10rpx 10rpx 0px 0px;
+		display: block;
+		
 	}
 
 	.timeBox {
@@ -330,16 +359,18 @@
 	}
 
 	.state {
-		width: 102rpx;
-		height: 53rpx;
+		width: 102rpx;
+		height: 53rpx;
+		position: relative;
+		
 	}
 
 	.time {
-		padding: 5rpx 10rpx;
-		color: #FFFFFF;
-		font-size: 24rpx;
-		background: #000000;
-
+		padding: 5rpx 10rpx;
+		color: #FFFFFF;
+		font-size: 24rpx;
+		background: rgba(0, 0, 0, 0.5);
+		margin-left: -8rpx;
 		border-radius: 0 10rpx 0 0;
 	}
 

pages/addjk/signJkDetail.vue

@@ -53,8 +53,14 @@
 				<view class="itemTop">
 					<image :src="item.HeadImg" mode="" class="icon"></image>
 					<view class="topRight">
-						<view class="nickName">微信昵称</view>
-						<view class="phone">{{item.str}}</view>
+						<view class="nickName">{{item.NickName?item.NickName:'微信昵称'}}</view>
+						<view>
+							<span class="phone" v-if="item.MobilePhone">{{item.MobilePhone}}</span>
+							<span class="phone" v-if="item.PlateNumber">/ {{item.PlateNumber}}</span>
+							<span class="phone" v-if="item.CustomerName">/ {{item.CustomerName}}</span>
+							<span class="phone" v-if="item.Unit">/ {{item.Unit}}</span>
+						</view>
+						
 					</view>
 				</view>
 
@@ -141,7 +147,9 @@
 						
 						item.str = item.MobilePhone?item.MobilePhone:'' + item.PlateNumber?'/'+item.PlateNumber:'' + item.CustomerName?'/'+item.CustomerName+'/':''  + item.Unit?'/'+item.Unit:''
 						
-					})
+					})
+					
+					
 
 					if (this.page == 1) {
 						this.itemData = list
@@ -155,7 +163,7 @@
 						this.noMoreShow = false
 					}
 
-
+					console.log('itemData--',this.itemData);
 
 
 
@@ -247,7 +255,8 @@
 
 		width: 100%;
 		background-color: #FFFFFF;
-		border: 1rpx solid #EEEEEE;
+		border-top: 1rpx solid #EEEEEE;
+		border-bottom: 1rpx solid #EEEEEE;
 	}
 
 	.searchBox {
@@ -322,7 +331,8 @@
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #666666;
-		line-height: 33rpx;
+		line-height: 33rpx;
+		margin-right: 10rpx;
 	}
 
 	.timeBox {

pages/addjk/statistics.vue

@@ -35,7 +35,7 @@
 				</view>
 				<view>
 					<view class="count">
-						<view class="num">{{itemData.employees}}</view>
+						<view class="num">{{itemData.employees?itemData.employees:'暂无'}}</view>
 						<view class="name">最多推广员工</view>
 					</view>
 					<view class="count">
@@ -45,11 +45,7 @@
 				</view>
 			</view>
 			
-			
-			
 			
-			<!-- 无数据空白页 -->
-			<nodata v-if="itemData.length==0"></nodata>
 		</view>
 
 
@@ -60,13 +56,8 @@
 
 <script>
 	
-	import nodata from '../../components/nodata/nodata.vue'
 	export default {
-		components: {
-			nodata,
-			
-		},
-
+		
 		data() {
 			return {
 				activity: {},
@@ -106,13 +97,7 @@
 						this.itemData = this.itemData.concat(list)
 					}
 
-					if (list.length < 10) {
-						this.noMoreShow = true
-					} else {
-						this.noMoreShow = false
-					}
-
-
+