Bläddra i källkod

Merge branch 'dev_1.0.4' of DeNet/de-net-official into master

zhangwei 2 år sedan
förälder
incheckning
99a1b34281
6 ändrade filer med 84 tillägg och 55 borttagningar
  1. 58 55
      pages/index.vue
  2. 4 0
      static/subject/01.svg
  3. 4 0
      static/subject/02.svg
  4. 6 0
      static/subject/gift.svg
  5. 6 0
      static/subject/pc.svg
  6. 6 0
      static/subject/right.svg

+ 58 - 55
pages/index.vue

@@ -156,15 +156,15 @@
 		</div>
 		<div v-if="show_moblie" class="moblie">
 			<div class="head-area">
-				<div class="txt">GET GIVEAWAY</div>
+				<div class="gift">
+                    <img :src=" require('../static/subject/gift.svg') " />
+                </div>
+				<div class="txt">
+                    <div>Complete tasks</div>
+                    <div>to Draw Prizes</div>
+                </div>
 			</div>
 			<!-- 领取列表 -->
-			<div class="luck-list-title">
-				<div>{{ detail.postBizData.receiveCount || 0 }}/{{ detail.postBizData.totalCount || 0 }} Winners</div>
-				<div> {{ detail.postBizData.receiveAmountValue }} / {{
-						detail.postBizData.amountValue || ''
-				}} {{ detail.postBizData.currencySymbol || '' }}</div>
-			</div>
 			<div class="luck-list" @scroll="handleScroll($event)">
 				<div class="luck-item" v-for="item, i in luck_list" v-bind:key="i">
 					<img v-if="item.simpleUserInfoVO.avatarUrl" :src="item.simpleUserInfoVO.avatarUrl" alt />
@@ -184,14 +184,17 @@
 				</div>
 			</div>
 			<div class="area-cp-link">
-				<div class="area-title">
-					<img src="/svg/icon-mobile.svg" alt="">
-					<div class="right">
-						<div class="right-title">Get Giveaway on PC</div>
-						<div class="right-content">You need to use a computer to complete tasks, and Get Giveaways (Just
-							2-3 minutes)</div>
-					</div>
-				</div>
+				<div class="area-list">
+                    <div class="item">
+                        <div class="icon"><img :src=" require('../static/subject/01.svg') " /></div>
+                        <div class="font">Complete the tasks on tweet</div>
+                    </div>
+                    <div class="item">
+                        <div class="icon"><img :src=" require('../static/subject/02.svg') " /></div>
+                        <div class="font">Open link on PC to draw</div>
+                        <div class="pc"><img :src=" require('../static/subject/pc.svg') " /></div>
+                    </div>
+                </div>
 				<div class="area-content">
 					{{ cp_link }}
 				</div>
@@ -685,7 +688,7 @@ body,
 
 	.head-area {
 		width: 100%;
-		height: 8rem;
+		height: 11rem;
 		text-align: center;
 		letter-spacing: 0.3px;
 		font-size: 2rem;
@@ -695,10 +698,16 @@ body,
 		border-radius: 0 586px 586px/0 0 104px 104px;
 		display: flex;
 		align-items: center;
-
+        justify-content: center;
+        .gift {
+            margin-right: 1.4rem;
+            img {
+                width: 5.2rem;
+            }
+        }
 		.txt {
-			width: 100%;
-			text-align: center;
+			font-size: 1.8rem;
+			text-align: left;
 		}
 	}
 
@@ -725,7 +734,7 @@ body,
 			display: flex;
 			padding: 12px 0;
 			margin: 0 16px;
-			border-bottom: 1px solid #d1d1d1;
+			border-bottom: 1px solid #F2F2F2;
 			justify-content: space-between;
 			position: relative;
 
@@ -811,49 +820,43 @@ body,
 
 	.area-cp-link {
 		background: #fff;
-		display: flex;
 		width: 100%;
 		flex-wrap: wrap;
-		position: fixed;
-		bottom: 0;
 		height: 20rem;
 		box-shadow: 0px -4px 10px rgba(0, 0, 0, 0.1);
-		border-top-left-radius: 2rem;
-		border-top-right-radius: 2rem;
-
-		.area-title {
-			display: flex;
-
-			img {
-				width: 6.4rem;
-				height: 6.4rem;
-				margin: 1.5rem;
-			}
-
-			.right {
-				flex: 1;
-				letter-spacing: 0.3px;
-
-				.right-title {
-					font-size: 1.7rem;
-					color: #000000;
-					margin-top: 1.7rem;
-
-				}
-
-				.right-content {
-					font-size: 1.2rem;
-					color: #989898;
-				}
-			}
-		}
+		border-top-left-radius: 1rem;
+		border-top-right-radius: 1rem;
+
+        .area-list {
+            width: 34.3rem;
+            margin: 1.5rem auto;
+            .item {
+                clear: both;
+                overflow: hidden;
+                margin: 0.7rem 0;
+                font-size: 1.6rem;
+                font-weight: 500;
+                .icon {
+                    float: left;
+                    margin-right: 0.8rem;
+                }
+                .font {
+                    float: left;
+                    margin-right: 0.8rem;
+                }
+                .pc {
+                    float: left;
+                }
+            }
+        }
 
 		.area-content {
 			background: #F4F4F4;
-			height: 4.6rem;
-			padding: 0 1rem;
-			width: 100%;
+			padding: 0.7rem 1rem;
+            margin: 0 auto 1rem;
+			width: 34.3rem;
 			font-size: 1.3rem;
+            border-radius: 0.5rem;
 			word-break: break-all;
 		}
 

+ 4 - 0
static/subject/01.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="#1D9BF0"/>
+<path d="M9.80176 14.5H11.8457V4.63574H9.79492L7.24512 6.40625V8.26562L9.76074 6.5293H9.80176V14.5Z" fill="white"/>
+</svg>

+ 4 - 0
static/subject/02.svg

@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="#1D9BF0"/>
+<path d="M6.35645 7.60254V7.63672H8.27051V7.60254C8.27051 6.69336 8.97461 6.02344 9.93164 6.02344C10.8477 6.02344 11.4971 6.61133 11.4971 7.34961C11.4971 8.0332 11.1895 8.53223 10.1914 9.53027L6.47266 13.1123V14.5H13.6436V12.8594H9.19336V12.8184L11.5996 10.501C12.6865 9.4209 13.5068 8.49805 13.5068 7.26758C13.5068 5.62012 12.0781 4.41699 10 4.41699C7.84668 4.41699 6.35645 5.73633 6.35645 7.60254Z" fill="white"/>
+</svg>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 6 - 0
static/subject/gift.svg


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 6 - 0
static/subject/pc.svg


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 6 - 0
static/subject/right.svg


Vissa filer visades inte eftersom för många filer har ändrats