Merge branch 'dev' into ats2

# Conflicts:
#	utils/request.js

pages/activity/jkDetail.vue

@@ -40,6 +40,19 @@
 			</view>
 		</view>
 		
+		<view class="couponPackageData" v-if="info.couponPackageName">
+			<view class="couponPackageTitle">{{info.couponPackageName}}</view>
+			<view class="linecouponCont" v-for="item in info.couponList">
+			  <view class="linecouponContLeft">
+				  <view class="couponType" v-if="item.discountType==1">满减券</view>
+				  <view class="couponType" v-if="item.discountType==2">商品券</view>
+				  <view class="couponType" v-if="item.discountType==3">服务券</view>
+				  <view class="couponName">{{item.actName}}</view>
+			  </view>
+			  <view class="couponNum">x{{item.actQty}}</view>
+			</view>
+		</view>
+		
 		<view class="shopBox">
 			<view class="shopBoxTop">
 				<view class="shopMs">活动门店</view>
@@ -222,6 +235,9 @@
 				
 			</view>
 		</view>
+		
+		
+		
 		<!-- 适用门店 -->
 		<view class="baomingBox ckshopBox" v-if="useShopShow" @click="noShowShop2">
 			<view class="baomingCont" @click.stop="">
@@ -266,6 +282,7 @@
 				 	<image src="../../static/timg/icon_wxhy.png" mode="" class="shareBimg"></image>
 				 	<view class="bottomTxtshare">分享</view>
 				 </button>
+				 
 				 <view @click="gowp">
 					 <img src="../../static/timg/icon_haibao.png" alt="" class="shareBimg">
 					 <view class="bottomTxtshare">生成海报</view> 
@@ -422,6 +439,11 @@
 			   clearInterval(this.ticker);
 			 }
 		   
+		    /* uni.showShareMenu({
+			 withShareTicket: true,
+			 menus: ['shareAppMessage', 'shareTimeline'], // 自定义分享面板的菜单项
+		   }); */
+		
 		   
 		},
 		onShow() {
@@ -1103,6 +1125,21 @@
 				}
 			}
 		},
+		
+		onShareTimeline() {
+			if(this.info.groupType){
+				//console.log(res.target.dataset.obj.ID)
+				var url= 'pages/subPack/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId+'&shareName='+this.userInfo.nickName+'&groupID='+res.target.dataset.obj.ID
+			}else{
+				var url= 'pages/activity/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId
+			}
+		    return {
+		      title: this.info.activityName,
+		      query:url,
+			  imageUrl:'http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png',
+		    }
+		  }
+		
 	}
 </script>
 
@@ -1821,4 +1858,45 @@ color: #FFFFFF;font-size: 26rpx;
 			font-weight: 500;font-size: 28rpx;
 			color: #FFFFFF;padding-top: 2rpx;
 		}
+		.couponPackageData{
+			background: #ffffff;
+			margin-top: 20rpx;
+		}
+		.couponPackageTitle{
+			padding-left: 24rpx;
+			padding-top: 30rpx;
+			color: #333333;
+			font-size: 32rpx;
+			line-height: 45rpx;
+			font-weight: 500;
+		}
+		.linecoupon{
+			justify-content: space-between;
+		}
+		.linecouponCont{
+			display: flex;
+			justify-content: space-between;
+			padding: 15rpx 24rpx;
+		}
+		.linecouponContLeft{
+			display: flex;
+			
+		}
+		.couponType{
+			color: #FFA511;
+			border: 1px solid #FFA511;
+			border-radius: 4rpx;
+			font-size: 18rpx;
+			line-height: 26rpx;
+			padding: 0 8rpx;
+			height: 26rpx;
+			margin-top: 5rpx;
+		}
+		.couponName{
+			font-size: 26rpx;line-height: 38rpx;color: #3C3C3C;
+			padding-left: 20rpx;
+		}
+		.couponNum{
+			font-size: 26rpx;line-height: 38rpx;color: #999999;
+		}
 </style>

pages/index/vipCard.vue

@@ -57,7 +57,7 @@
 		
 		<!-- 卡制度 -->
 		<view v-for="(item,index) in vipData.f2ccard" class="ftwoccard">
-			<view class="itemBox" v-if="AmountQtyJsFcard(item.detail)">
+			<view class="itemBox" ><!-- v-if="AmountQtyJsFcard(item.detail)" -->
 			<view class="itemTop">
 				<view class="itemName">
 					<span class="titleType2" >卡</span>
@@ -72,13 +72,13 @@
 			</view>
 			<view class="fcardBottom" :class="{fcardBottomactive:item.open}">
 				<view class="fcardCardCode">{{item.card.cardCode}}</view>
-				<view class="fcardCardCode">{{item.card.expireTime.slice(0,10)}}</view>
+				<view class="fcardCardCode" v-if="item.card.expireTime">{{item.card.expireTime.slice(0,10)}}</view>
 			</view>
 			
 		
 			<view v-if="item.open">
 				<!-- 不展示剩余为0项 -->
-				<view class="itemBg " v-if="dis&&v.lastCount!=0" v-for="(v,index2) in item.detail" :key="index2">
+			<!-- 	<view class="itemBg " v-if="dis&&v.lastCount!=0" v-for="(v,index2) in item.detail" :key="index2">
 					<view class="nameTop" v-if="v.type==2"><span class="type">项目</span> {{v.bizName}}</view>
 					<view class="nameTop" v-if="v.type==1"><span class="type">商品</span> {{v.bizName}}</view>
 					<view class="itemBgFcard">
@@ -95,10 +95,10 @@
 						</view>
 					</view>
 					
-				</view>
+				</view> -->
 				
 				<!-- 展示所有 -->
-				<view class="itemBg " v-if="!dis" v-for="(v,index2) in item.detail" :key="index2">
+				<view class="itemBg "  v-for="(v,index2) in item.detail" :key="index2"><!-- v-if="!dis" -->
 					<view class="nameTop" v-if="v.type==2"><span class="type">项目</span> {{v.bizName}}</view>
 					<view class="nameTop" v-if="v.type==1"><span class="type">商品</span> {{v.bizName}}</view>
 					<view class="itemBgFcard">
@@ -133,11 +133,11 @@
 					</view>
 					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
 				</view>
-				<view class="itemBottom" :class="{active:item.open}" @click="changeState(item)">
+				<view class="itemBottom" :class="{active:item.open&&item.list.length>0}" @click="changeState(item)">
 					<view class="shopName">{{item.shopName}}</view>
-					<image  v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
+					<image  v-if="item.open==false&&item.list.length>0" src="../../static/img/icon_arrow_down.png"
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
-					<image  v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
+					<image  v-if="item.open==true&&item.list.length>0" src="../../static/img/icon_arrow_up.png"
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
 				</view>
 
@@ -149,7 +149,7 @@
 						<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
 
 						<view class="timeBottom">
-							<view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
+							<view class="time" v-if="v.ExpireTime&&v.ExpireTime!=null&&v.ExpireTime!='null'">有效期：{{v.ExpireTime.slice(0,10)}}</view>
 							<view class="time" v-else>有效期：永久</view>
 							<view>剩余/总：<span
 									style="color: #FF3B30;">{{v.AmountQty}}</span>/{{v.TotalQty}}
@@ -165,7 +165,7 @@
 							<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
 					
 							<view class="timeBottom">
-								<view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
+								<view class="time" v-if="v.ExpireTime&&v.ExpireTime!=null&&v.ExpireTime!='null'">有效期：{{v.ExpireTime.slice(0,10)}}</view>
 								<view class="time" v-else>有效期：永久</view>
 								<view>剩余/总：<span
 										style="color: #FF3B30;">{{v.AmountQty}}</span>/{{v.TotalQty}}
@@ -218,9 +218,9 @@
 					<view class="shopName">{{item.ShopName}}</view>
 			
 					
-					<image  v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
+					<image  v-if="item.open==false&&item.payList.length>0" src="../../static/img/icon_arrow_down.png"
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
-					<image  v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
+					<image  v-if="item.open==true&&item.payList.length>0" src="../../static/img/icon_arrow_up.png"
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
 				</view>
 			
@@ -349,6 +349,7 @@
 				wxOpenData:'',
 			}
 		},
+		
 		onLoad() {
 			//this.userInfo = uni.getStorageSync("userInfo");
 			this.userInfo=this.$store.state.userInfo;
@@ -368,7 +369,12 @@
 			}
 			
 		},
-
+        filter:{
+			filter_formatId(value) {
+				  console.log(value)
+			      return value//.slice(0,10);
+			    }
+		},
 		methods: {
 			shiyongShowHlde(){
 				this.shiyongShow=false;
@@ -435,7 +441,7 @@
 					})
 
 					this.vipData = list
-
+                    console.log(this.vipData)
 
 
 
@@ -548,6 +554,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 .fcardBottom{
 	display: flex;justify-content: space-between;color: #999999;font-size: 24rpx;
 	padding-top: 12rpx;
+	padding-right: 20rpx;
 }
 	.topVipIcon{
 		width: 41rpx;height: 40rpx;
@@ -696,12 +703,14 @@ border-radius: 4rpx;margin-right: 8rpx;
 		border-radius: 10rpx;
 		padding: 24rpx 20rpx;
 		margin-top: 20rpx;
+		padding-right: 0px;
 	}
 
 	.itemTop {
 		display: flex;
 		justify-content: space-between;
 		align-items: baseline;
+		padding-right: 20rpx;
 	}
 
 	.itemBottom {
@@ -709,7 +718,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 		justify-content: space-between;
 		align-items: center;
 		margin-top: 15rpx;
-
+        padding-right: 20rpx;
 	}
 
 	.active {
@@ -752,6 +761,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 	.itemBg {
 		padding: 30rpx 0rpx;
 		border-top: 1rpx solid #EEEEEE;
+		padding-right: 20rpx;
 	}
 	.itemBgFcard{
 		    display: flex;

pages/subPack/jkDetail.vue

@@ -14,7 +14,19 @@
 			<view class="name3">{{info.activityContent}}</view>
 		</view>
 	
-		
+		 <view class="couponPackageData" v-if="info.couponPackageName">
+		 	<view class="couponPackageTitle">{{info.couponPackageName}}</view>
+		 	<view class="linecouponCont" v-for="item in info.couponList">
+		 	  <view class="linecouponContLeft">
+		 		  <view class="couponType" v-if="item.discountType==1">满减券</view>
+		 		  <view class="couponType" v-if="item.discountType==2">商品券</view>
+		 		  <view class="couponType" v-if="item.discountType==3">服务券</view>
+		 		  <view class="couponName">{{item.actName}}</view>
+		 	  </view>
+		 	  <view class="couponNum">x{{item.actQty}}</view>
+		 	</view>
+		 </view>
+		 
 		<view class="shopBox">
 			<view class="shopBoxTop">
 				<view class="shopMs">活动门店</view>
@@ -2016,4 +2028,45 @@ color: #FFFFFF;font-size: 26rpx;
 			background-size: 100% 100%;
 			padding-left: 64rpx;padding-right: 4rpx;
 		}
+		.couponPackageData{
+			background: #ffffff;
+			margin-top: 20rpx;
+		}
+		.couponPackageTitle{
+			padding-left: 24rpx;
+			padding-top: 30rpx;
+			color: #333333;
+			font-size: 32rpx;
+			line-height: 45rpx;
+			font-weight: 500;
+		}
+		.linecoupon{
+			justify-content: space-between;
+		}
+		.linecouponCont{
+			display: flex;
+			justify-content: space-between;
+			padding: 15rpx 24rpx;
+		}
+		.linecouponContLeft{
+			display: flex;
+			
+		}
+		.couponType{
+			color: #FFA511;
+			border: 1px solid #FFA511;
+			border-radius: 4rpx;
+			font-size: 18rpx;
+			line-height: 26rpx;
+			padding: 0 8rpx;
+			height: 26rpx;
+			margin-top: 5rpx;
+		}
+		.couponName{
+			font-size: 26rpx;line-height: 38rpx;color: #3C3C3C;
+			padding-left: 20rpx;
+		}
+		.couponNum{
+			font-size: 26rpx;line-height: 38rpx;color: #999999;
+		}
 </style>

pages/user/historyDetail.vue

@@ -150,6 +150,9 @@
 					<view class="informationNum" v-if="orderData.billsheet.Comment">{{orderData.billsheet.Comment}}
 					</view>
 				</view>
+				<view class="imgListBox">
+					<image class="pictureImg" @click="seeImg(index)" :src="item.imgPath" mode="" v-for="(item,index) in imgList"></image>
+				</view>
 
 			</view>
 
@@ -325,6 +328,8 @@
 				iStatusBarHeight:'',
 				ShowSetting:'',
 				goodsMoney:'',
+				Picture:false,//图片
+				imgList:[]
 			}
 		},
 		onLoad(opt) {
@@ -355,6 +360,26 @@
 		},
 
 		methods: {
+			seeImg(index){
+				console.log(index)
+				var imgs=[]
+				this.imgList.forEach(item=>{
+					imgs.push(item.imgPath)
+				})
+				uni.previewImage({
+					urls:imgs ,
+					current: index,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 			//显示权限
 			showPower() {
 				this.$http('openweiXinCardInfoController/getShowSetting', {
@@ -436,13 +461,27 @@
 						if (item.fieldValue == 'goodsMoney') {
 							this.goodsMoney = item.isChecked
 						}
-                        
+                        if(item.fieldValue =='Picture'){
+							this.Picture = item.isChecked
+							if(item.isChecked){
+								this.queryBillInsurancePolicy()
+							}
+						}
 
 
 					})
 
 				})
 			},
+			queryBillInsurancePolicy(){
+				this.$http('openweiXinCardInfoController/queryBillInsurancePolicy', {
+				   sheetID:this.id
+				}, 'GET').then(res => {
+					this.imgList=res.data
+				
+				
+				})
+			},
 			//评价权限
 			myPower() {
 				this.$http('openMiniEvaluate/getEvaluateSetting', {
@@ -620,6 +659,14 @@
 </script>
 
 <style scoped>
+	.imgListBox{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.pictureImg{
+		width:170rpx;height: 170rpx;
+		margin: 2rpx;
+	}
 	.SalePrice{
 		    color: #3C3C3C;
 			font-weight: 600;