bug修改

pages/addjk/activity.vue

@@ -200,7 +200,7 @@
 							uni.showLoading({
 								title: '加载中'
 							});
-							that.$http('openH5SetTheGuest/updateAtivitySate', {
+							that.$http('openH5SetTheGuest/updateActivityState', {
 								id: item.ID,
 								clState: 1
 							}, 'POST').then(res => {

pages/addjk/ckshop.vue

@@ -119,6 +119,7 @@
 	}
 	.content2{
 		padding: 20rpx 24rpx;
+		padding-bottom: 140rpx;
 	}
 	.shopLine{
 		display: flex;

pages/addjk/eadit.vue

@@ -57,7 +57,7 @@
 			  <span class="linexx">*</span> <span>最多报名人数</span>
 		  </view>
 		  <view class="lineRight">
-			  <input  type="number" v-model="number" placeholder="请输入" class="lineRightInput" placeholder-class="inputPlace">
+			  <input :disabled="isExistGroup" type="number" v-model="number" placeholder="请输入" class="lineRightInput" placeholder-class="inputPlace">
 		  </view>
 		</view>
 		<view class="line"  ><!-- style="border: none;" -->
@@ -65,7 +65,7 @@
 			  <span class="linexx">*</span> <span>支付方式</span>
 		  </view>
 		  <view class="lineRight payBox">
-			 <view class="payType" @click="payType=1">
+			 <view class="payType" @click="payTypeCL(1)">
 				 <img src="../../static/img/ckn.png" alt="" class="payTypeImg" v-if="payType!=1">
 				 <img src="../../static/img/cky.png" alt="" class="payTypeImg" v-if="payType==1">
 				 <view class="payTypeTxt">在线支付</view>
@@ -82,7 +82,7 @@
 			  <span class="linexx">*</span> <span>支付金额</span>
 		  </view>
 		  <view class="lineRight">
-			  <input type="text" v-model="money" placeholder="请输入" class="lineRightInput" placeholder-class="inputPlace">
+			  <input :disabled="isExistGroup" type="text" v-model="money" placeholder="请输入" class="lineRightInput" placeholder-class="inputPlace">
 		  </view>
 		</view>
 		<view v-if="payType==1">
@@ -90,7 +90,7 @@
 				<view class="lineLeft">
 					<span>拼团设置</span>
 				</view>
-				<view class="lineRight"><switch :checked='groupType' @change="switchgroupType" style="transform:scale(0.8)"/></view>
+				<view class="lineRight"><switch :disabled="isExistGroup" :checked='groupType' @change="switchgroupType" style="transform:scale(0.8)"/></view>
 			</view>
 			<view v-if="groupType">
 				<view class="line" >
@@ -98,7 +98,7 @@
 					  <span class="linexx">*</span> <span>拼团人数</span>
 				  </view>
 				  <view class="lineRight">
-					  <input type="number" @blur="blurgroupNumber" v-model="groupNumber" placeholder="可输入大于1的整数" class="lineRightInput" placeholder-class="inputPlace">
+					  <input type="number" :disabled="isExistGroup" @blur="blurgroupNumber" v-model="groupNumber" placeholder="可输入大于1的整数" class="lineRightInput" placeholder-class="inputPlace">
 				  </view>
 				</view>
 				<view class="line" >
@@ -106,7 +106,7 @@
 					  <span class="linexx">*</span> <span>拼团有效期</span>
 				  </view>
 				  <view class="lineRight">
-					  <input type="digit" @blur="blurgroupTime" v-model="groupTime" placeholder="可输入0.5至72小时" class="linecInput" placeholder-class="inputPlace">
+					  <input type="digit" :disabled="isExistGroup" @blur="blurgroupTime" v-model="groupTime" placeholder="可输入0.5至72小时" class="linecInput" placeholder-class="inputPlace">
 				  </view>
 				  <viwe class="lineRight">小时</viwe>
 				</view>
@@ -115,7 +115,7 @@
 					  <span class="linexx">*</span> <span>拼团价</span>
 				  </view>
 				  <view class="lineRight">
-					  <input type="digit" @blur="blurgroupMoney" v-model="groupMoney" placeholder="需小于支付金额" class="linecInput" placeholder-class="inputPlace">
+					  <input type="digit" :disabled="isExistGroup" @blur="blurgroupMoney" v-model="groupMoney" placeholder="需小于支付金额" class="linecInput" placeholder-class="inputPlace">
 				  </view>
 				  <viwe class="lineRight">元</viwe>
 				</view>
@@ -124,14 +124,14 @@
 						 <span class="linexx">*</span><span>拼团超时自动成团</span> 
 						 <image @click="zyct" src="../../static/img/icon_help.png" mode="" class="helpIcon"></image>
 					</view>
-					<view class="lineRight"><switch :checked='groupOutState' @change="switchgroupOutState" style="transform:scale(0.8)"/></view>
+					<view class="lineRight"><switch :disabled="isExistGroup" :checked='groupOutState' @change="switchgroupOutState" style="transform:scale(0.8)"/></view>
 				</view>
 				<view class="line line3">
 					<view class="lineLeft2">
 						 <span class="linexx">*</span><span>自由参团</span> 
 						 <image  @click="zdct" src="../../static/img/icon_help.png" mode="" class="helpIcon"></image>
 					</view>
-					<view class="lineRight"><switch :checked='groupRestrictions' @change="switchgroupRestrictions" style="transform:scale(0.8)"/></view>
+					<view class="lineRight"><switch :disabled="isExistGroup" :checked='groupRestrictions' @change="switchgroupRestrictions" style="transform:scale(0.8)"/></view>
 				</view>
 			</view>
 		
@@ -272,9 +272,18 @@
 		},
 		methods: {
 		  nopayCl(){
+			  if(this.isExistGroup){
+				  return false
+			  }
 			  this.payType=2;
 			  this.groupType=false
 		  },
+		  payTypeCL(){
+			  if(this.isExistGroup){
+			  				  return false
+			  }
+			   this.payType=1;
+		  },
 		  zdct(){
 			  uni.showModal({
 			  	title: '自由参团',
@@ -477,14 +486,14 @@
 			  }
 		  },
 		  preview(){
-			  if(this.isExistGroup){
+			 /* if(this.isExistGroup){
 				  uni.showToast({
-				  	 title: '已有用户参与该拼团活动,无法修改活动内容',
+				  	 title: '已有用户参与该拼团活动,无法修改报名信息',
 				  	 icon:'none',
 				  	 duration: 3000
 				  });
 				  return false
-			  }
+			  } */
 			//console.log(this.clWhere)
 			 // if(this.money==0){
 				//  this.money=0
@@ -645,6 +654,9 @@
 			  this.endTime=e.detail.value;
 		  },
 		  clWhere(num){
+			  if(this.isExistGroup){
+				  return false
+			  }
 			  console.log(this.clWhereList)
 			  this.clWhereString=this.clWhereList.join(',');
 			  if(this.clWhereString.indexOf(num)!=-1){

pages/addjk/signJkDetail.vue

@@ -63,6 +63,7 @@
 
 		<view class="contentBox">
 			<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="godetail(item)">
+				<image src="../../static/img/jt.png" mode="" class="itemHistoryJt"></image>
 				<view class="itemTop">
 					<image :src="item.HeadImg" mode="" class="icon"></image>
 					<view class="topRight">
@@ -77,10 +78,11 @@
 					</view>
 				</view>
 
-				<view class="timeBox"><span class="leftTitle">报名时间：</span>{{item.CreateTime}}</view>
+				<view class="timeBox"><span class="leftTitle">报名时间：</span>{{item.CreateTime}}</view>
+				<view class="timeBox"><span class="leftTitle">报名门店：</span>{{item.ShopName}}</view>
 				<view class="zhuangtaiBox" v-if="item.WriteoffState==1"><span class="leftTitle">核销状态：</span> 未核销</view>
 				<view class="zhuangtaiBox" v-if="item.WriteoffState==3"><span class="leftTitle">核销状态：</span> 已核销 {{item.WriteoffTime}}</view>
-			    <view class="timeBox"><span class="leftTitle">报名门店：</span>{{item.ShopName}}</view>
+			   
 				<view class="timeBox" v-if="item.WriteoffState==3" style="display: flex;"><span class="leftTitle">核销门店：</span> <view style="width: 500rpx;">{{item.WriteoffShopName}}</view> </view>
 			</view>
 
@@ -116,7 +118,7 @@
 				selectTab: 0,
                 pickerindex:0,
                 pickerarray: [],
-				shopName:'',
+				shopName:'报名门店',
 				shopId:'',
 			}
 		},
@@ -126,6 +128,7 @@
 			console.log('activity==', this.activity);
 			this.page = 1
 			//this.myOrderCoupon()
+			this.myOrderCoupon()
 		},
 		methods: {
 			godetail(e){
@@ -142,12 +145,12 @@
 			},
             getShopinfo(){
             	this.$http('openH5SetTheGuest/getShopInfo',{},'GET').then(res => {
-            			this.shopName=res.data.shopName;
+            			//this.shopName=res.data.shopName;
             			/* this.mrshopId=res.data.id;
             			this.mrshopName=res.data.shopName; */
-            			this.shopId=res.data.id
+            			//this.shopId=res.data.id
             			this.getShopList();
-						this.myOrderCoupon()
+						
             			
             	 })
             },
@@ -156,8 +159,10 @@
 				   this.$http('openH5SetTheGuest/getShopList', {
 					 
 					},'GET').then(res => {
+						var kong={id:'',shopName:'报名门店'}
 						
 						this.pickerarray=res.data;
+						this.pickerarray.unshift(kong)
 						/* this.pickerarray.forEach((item,index)=>{
 							
 							if(this.mrshopId==item.id){
@@ -195,7 +200,7 @@
 					writeoffState: this.selectTab ? this.selectTab : '',
 					page: this.page,
 					limit: 99,
-					shopId:this.shopId
+					shopID:this.shopId
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					// var list = res.data.Items
@@ -259,6 +264,11 @@
 		  font-weight: 400;
 		  color: #666666;
 		  line-height: 40rpx;
+		  width: 300rpx;
+		  overflow: hidden;        
+	      text-overflow:ellipsis;  
+		  white-space: nowrap;
+		  text-align: right;
 	}
 	.box {
 		min-height: 100vh;
@@ -368,16 +378,22 @@
 	}
 
 	.itemHistory {
-
+        position: relative;
 		padding: 24rpx 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
 		margin-bottom: 20rpx;
 	}
-
+    .itemHistoryJt{
+		position: absolute;
+		top: 30rpx;
+		right: 24rpx;
+		width:24rpx;
+		height: 24rpx;
+	}
 	.itemTop {
 		display: flex;
-		padding-bottom: 24rpx;
+		padding-bottom: 20rpx;
 		border-bottom: 1rpx solid #EEEEEE;
 	}
 
@@ -394,7 +410,7 @@
 		font-weight: 400;
 		color: #3C3C3C;
 		line-height: 42rpx;
-		margin-bottom: 8rpx;
+		
 	}
 
 	.phone {
@@ -426,7 +442,7 @@
 		font-weight: 400;
 		color: #3C3C3C;
 		line-height: 33rpx;
-		margin-top: 16rpx;
+		margin-top: 24rpx;
 	}
 
 	.black {

pages/myOrder/activityOrderDetail.vue

@@ -61,11 +61,11 @@
 		<view class="information">
 			<view class="detailedTitle ptzt">订单内容
 			<view class="groupStateBox " v-if="orderData.data.groupState==4">
-				 <image src="../../static/img/cky.png" mode="" class="groupStateIcon"></image>
+				 <image src="../../static/img/icon_checked@2x.png" mode="" class="groupStateIcon"></image>
 				 <view class="groupStateTxt">自动成团</view>
 			</view>
 			<view class="groupStateBox " v-if="orderData.data.groupState==3">
-				 <image src="../../static/img/cky.png" mode="" class="groupStateIcon"></image>
+				 <image src="../../static/img/icon_checked@2x.png" mode="" class="groupStateIcon"></image>
 				 <view class="groupStateTxt">拼团成功</view>
 			</view>
 			<view class="groupStateBox " v-if="orderData.data.groupState==1">
@@ -107,7 +107,7 @@
 						
 						</view>
 							<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-											v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+											v-if="v.writeoffState==1" @click="isShowMaSHow(index)"></image>
 					</view>
 										
 						<view class="writeoffLineBox" v-if="v.writeoffState==3">
@@ -241,7 +241,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC"
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC"
 					indicator-active-color="#D53533">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
@@ -358,6 +358,7 @@
 				tuikuanContent: '',
 				index: 0,
 				iOSInfo:'',
+				swiperIndex:0,
 			}
 		},
 		onLoad(opt) {
@@ -381,7 +382,8 @@
 
 
 		methods: {
-			isShowMaSHow(){
+			isShowMaSHow(index){
+				 this.swiperIndex=index
 				 this.isShowMa=true
 			},
 			getAndroid(e){

pages/myOrder/mallOrderDetail.vue

@@ -91,7 +91,7 @@
                    	
                    	</view>
 					<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow(index)"></image>
                    </view>
 					
 					<view class="writeoffLineBox" v-if="v.writeoffState==3">
@@ -245,7 +245,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC"
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC"
 					indicator-active-color="#D53533">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
@@ -364,6 +364,7 @@
 				tuikuanContent: '',
 				index: 0,
 				iOSInfo:'',
+				swiperIndex:0,
 			}
 		},
 		onLoad(opt) {
@@ -387,7 +388,8 @@
 
 
 		methods: {
-			isShowMaSHow(){
+			isShowMaSHow(index){
+				this.swiperIndex=index
 				 this.isShowMa=true
 			},
 			getAndroid(e){

pages/myOrder/paintOrderDetail.vue

@@ -87,7 +87,7 @@
                    	
                    	</view>
 					<image src="../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow(index)"></image>
                    </view>
 					
 					<view class="writeoffLineBox" v-if="v.writeoffState==3">
@@ -229,7 +229,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
 							<view class="maCode">{{item}}</view>
@@ -344,7 +344,7 @@
 				tuikuanContent:'',
 				index: 0,
 				iOSInfo:'',
-				
+				swiperIndex:0,
 			}
 		},
 		onLoad(opt) {
@@ -367,6 +367,10 @@
 		
 
 		methods: {
+			isShowMaSHow(index){
+				this.swiperIndex=index
+				 this.isShowMa=true
+			},
 			getAndroid(e){
 				this.iOSInfo=e		
 			},