zhengkaixin 2 年之前
父節點
當前提交
2629b9fa5f

+ 1 - 1
pages/mine/data.vue

@@ -139,7 +139,7 @@
 						  
 						  
 						  var blob= dataURLtoBlob(fileData)
-						  var file= blobToFile(blob,'1.jpg')
+						  var file= blobToFile(blob,parseInt(Math.random()*100000000)+'.jpg')
 						  console.log(file)
 						  
 						//返回 base64 图片

+ 1 - 3
pages/news/articleDetails.vue

@@ -255,9 +255,7 @@
 </script>
 
 <style lang="scss" scoped>
-	img{
-		width: 100% !important;
-	}
+	
 	page{
 		padding-bottom:100px;
 	}

+ 10 - 34
pages/staffHome/activityReward/rewardDetail.vue

@@ -2,40 +2,16 @@
 	<view>
 		<u-navbar title="活动奖励详情"></u-navbar>
 		
-		<view class="reward-group" v-if="false">
-			<view class="reward-item">
-				劳模
-			</view>
-			<view class="reward-item">
-				
-			</view>
-			<view class="reward-item">
-				先进员工
-			</view>
-			<view class="reward-item">
-				
-			</view>
-			<view class="reward-item">
-				优秀员工
-			</view>
-			<view class="reward-item">
-				
-			</view>
-			<view class="reward-item">
-				一等奖
-			</view>
-			<view class="reward-item">
-				
-			</view>
-			<view class="reward-item">
-				二等奖
-			</view>
-			<view class="reward-item">
-				
-			</view>
-			<view class="reward-item">
-				三等奖
-			</view>
+		<view class="reward-group" >
+				<view v-for="(item,i) in list" :key="i">
+					<view class="reward-item">
+						{{item.place}}
+					</view>
+					<view class="reward-item">
+						{{item.listName.join()}}
+					</view>
+				</view>
+			
 			
 			</view>
 			<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>

+ 1 - 1
pages/staffHome/teamHonor/badgeDetails.vue

@@ -149,7 +149,7 @@
 
 		.icon {
 			img {
-				width: 136rpx;
+				max-width: 536rpx;
 				height: 140rpx;
 			}
 		}