twt пре 2 година
родитељ
комит
480ba52c5a

+ 3 - 1
pages/activity/jkDetail.vue

@@ -9,7 +9,9 @@
 			  <view class="ptNameBz" v-if="info.groupType">
 				  {{info.groupNumber}}人团
 			  </view>
-			 {{info.activityName}}</view>
+			  <view style="width: 550rpx;"> {{info.activityName}}</view>
+			
+			 </view>
 			<view class="name2">{{info.startTime.slice(0,10)}}~{{info.endTime.slice(0,10)}}</view> 
 			<view class="name3">{{info.activityContent}}</view>
 		</view>

+ 7 - 0
pages/integral/integralgoodsDetail.vue

@@ -271,6 +271,13 @@
 				})
 			},
 			goBuy(){
+				if(this.goodsnum>this.info.dayCount){
+					uni.showToast({
+						title:'超过兑换限制',
+						icon:'none',
+					})
+					return false;
+				}
 				if(!this.shopInfo.qty){
 					uni.showToast({
 						title: '库存不足',

+ 6 - 2
pages/shop/wp.vue

@@ -62,7 +62,8 @@
 			this.time=opt.time
 			//this.avatar=this.avatar.replace('http','https');
 			console.log(this.avatar)
-			this.nickname=opt.name;	
+			this.nickname=opt.name;
+			
 			if(opt.sellingPoint&&opt.sellingPoint!='undefined'){
 				this.sellingPoint=opt.sellingPoint;
 			}
@@ -73,7 +74,10 @@
 			}
 			if(opt.groupType!=0){
 				console.log(opt.groupType)
-				this.groupType=opt.groupType
+				this.groupType=opt.groupType;
+				if(this.nickname.length>12){
+					this.nickname=this.nickname.substring(0,12)+'...'
+				}
 			}
 			//console.log(this.nickname+this.nickname.length)
 			this.userInfo=this.$store.state.userInfo;

+ 1 - 1
pages/subPack/jkDetail.vue

@@ -9,7 +9,7 @@
 			<view class="ptNameBz" v-if="info.groupType">
 							  {{info.groupNumber}}人团
 			</view>
-			{{info.activityName}}</view>
+			<view style="width: 550rpx;"> {{info.activityName}}</view></view>
 			<view class="name2">{{info.startTime.slice(0,10)}}~{{info.endTime.slice(0,10)}}</view>
 			<view class="name3">{{info.activityContent}}</view>
 		</view>

+ 5 - 0
pages/user/user.vue

@@ -729,6 +729,11 @@
 		font-weight: bold;
 		line-height: 48rpx;
 		height: 48rpx;
+		width: 430rpx;   
+		overflow: hidden;        /*内容会被修剪,并且其余内容是不可见的*/
+		text-overflow:ellipsis;  /*显示省略符号来代表被修剪的文本。*/
+		 white-space: nowrap;     /*文本不换行*/
+
 	}
 
 	.grade {