Merge branch 'dev' into ats2

# Conflicts:
#	utils/request.js

pages/activity/jkDetail.vue

@@ -392,6 +392,7 @@
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 		   console.log(opt)
+		   this.collectingID=opt.id;
 		   if(opt.shareId){
 			   this.shareId=opt.shareId
 		   }
@@ -407,7 +408,7 @@
 				this.scene=opt.scene;
 				this.getShareParams()
 			}else{
-				this.collectingID=opt.id;
+				
 				//this.getInfo();
 				this.queryActivityInfo();
 				this.queryGoodsLook()
@@ -422,7 +423,7 @@
 		   			this.scene=opt.scene;
 		   			this.getShareParams()
 		   		}else{
-		   			this.collectingID=opt.id;
+		   			
 		   			//this.getInfo();
 		   			this.queryActivityInfo();
 		   			this.queryGoodsLook()
@@ -1093,7 +1094,7 @@
 		  that = this;
 		},
 		onShareAppMessage(res) {
-			console.log(this.userInfo)
+			console.log(res)
 			var img='';
 			/* if(this.info.ImgList.length>0){
 				img=this.info.ImgList[0].url
@@ -1126,12 +1127,13 @@
 			}
 		},
 		
-		onShareTimeline() {
+		onShareTimeline(res) {
+			
 			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
+				var url= '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
+				var url= 'id=' + this.collectingID+'&shareId='+this.userInfo.openId
 			}
 		    return {
 		      title: this.info.activityName,

pages/user/user.vue

@@ -10,6 +10,7 @@
 				<view class="mes">
 					<view class="nick">
 						<view class="nickName" v-if="nickName">{{nickName}}</view>
+						<view class="nickName2" v-else>微信用户</view>
 						<!-- <view class="grade" @click="gonavigateTo('../index/vipCard')" v-if="numList.levelName&&showSetting.isShowLevel">{{numList.levelName}} ></view>-->
 					   <view class="cardNameBOx" v-if="numList.levelName&&showSetting.isShowLevel" @click="gonavigateTo('../subPack/vipCard')"> 
 						  <image class="cardNameIcon" src="http://dmsphoto.66km.com.cn/thFiles/E3F78C8A-CF4F-40DD-B050-689CFCEA2F4C.png" mode=""></image>
@@ -60,7 +61,7 @@
 		<view v-if="showSetting.isShowCardSystem&&f2csystemlist">
 				<view >
 				<swiper class="swiper2"  :autoplay="false" :interval="interval"
-								:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
+						:current="f2cIndex"		:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
 				
 					<swiper-item v-for="(item,index) in f2csystemlist">
 						<view class="cardBox">
@@ -426,6 +427,7 @@
 				showSetting:'',
 				f2csystemlist:'',
 				exitNum:'',
+				f2cIndex:'',
 			}
 		},
 		onLoad(opt) {
@@ -776,6 +778,15 @@
 					if(this.numList.customerInfo.rebateState==1&&this.numList.shopSettings.introductionDisabled){
 						this.kkshow=true
 					}
+					if(this.f2csystemlist.length>0){
+						this.f2csystemlist.forEach((item,index)=>{
+							if(item.growthState==1){
+								this.f2cIndex=index
+							}
+						})
+						
+					}
+					
 				})
 			},
 			gonavigateTo(url) {
@@ -1115,6 +1126,17 @@ padding-right: 10rpx;
 		text-overflow:ellipsis;  /*显示省略符号来代表被修剪的文本。*/
 		 white-space: nowrap;     /*文本不换行*/
 
+	}
+	.nickName2 {
+		font-size: 30rpx;
+		color: #FFFFFF;
+		font-weight: bold;
+		line-height: 48rpx;
+		height: 48rpx;
+		overflow: hidden;        /*内容会被修剪，并且其余内容是不可见的*/
+		text-overflow:ellipsis;  /*显示省略符号来代表被修剪的文本。*/
+		 white-space: nowrap;     /*文本不换行*/
+	
 	}
 
 	.grade {