李志伟 3 years ago
parent
commit
16355d8d3d
4 changed files with 15 additions and 18 deletions
  1. 11
    12
      src/pages/AllPages.vue
  2. 1
    2
      src/pages/index.vue
  3. 2
    3
      src/pages/resultPage.vue
  4. 1
    1
      src/pages/signup.vue

+ 11
- 12
src/pages/AllPages.vue View File

@@ -2,27 +2,27 @@
2 2
   <div class="index-box">
3 3
     <img src="../../public/fourBoxes-image/1.jpg" class="bg-image" />
4 4
     <div class="index-FourBoxes">
5
-      <div class="index-FourBoxes-yushi test" :class="{ active: currentItem === 0 }" @click="goPagess(0)">
5
+      <div class="index-FourBoxes-yushi test" style="margin-bottom:2vw" :class="{ active: currentItem === 0 }" @click="goPagess(0)">
6 6
         <img src="../../public/fourBoxes-image/浴室.png" class="Four-image" @transitionend="handleTransitionEnd('yushi')" />
7
-        <div style=" width: 21vw; position: absolute; left: 13.5vw; top: 36vh;">
7
+        <div style=" width: 21vw; position: absolute; left: 13.5vw; top: 70vw;">
8 8
           <img style=" width:100%;" src="../assets/fourBoxes-2/浴室-2.png" />
9 9
         </div>
10 10
       </div>
11
-      <div class="index-FourBoxes-yimao test" :class="{ active: currentItem === 1 }" @click="goPagess(1)">
11
+      <div class="index-FourBoxes-yimao test" style="margin-bottom:2vw" :class="{ active: currentItem === 1 }" @click="goPagess(1)">
12 12
         <img src="../../public/fourBoxes-image/衣帽间.png" class="Four-image" @transitionend="handleTransitionEnd('yimao')" />
13
-        <div style=" width: 21vw;; position: absolute; right: 13.5vw; top: 36vh;">
13
+        <div style=" width: 21vw;; position: absolute; right: 13.5vw; top: 70vw;">
14 14
           <img style=" width:100%;" src="../assets/fourBoxes-2/衣帽间-2.png" />
15 15
         </div>
16 16
       </div>
17 17
       <div class="index-FourBoxes-keting test" :class="{ active: currentItem === 2 }" @click="goPagess(2)">
18 18
         <img src="../../public/fourBoxes-image/客厅.png" @transitionend="handleTransitionEnd('keting')" class="Four-image" />
19
-        <div style=" width: 21vw;; position: absolute; left: 13.5vw; top: 77vh;">
19
+        <div style=" width: 21vw;; position: absolute; left: 13.5vw; top: 70vw;">
20 20
           <img style=" width:100%;" src="../assets/fourBoxes-2/客厅-2.png" />
21 21
         </div>
22 22
       </div>
23 23
       <div class="index-FourBoxes-yangtai test" :class="{ active: currentItem === 3 }" @click="goPagess(3)">
24 24
         <img src="../../public/fourBoxes-image/阳台.png" @transitionend="handleTransitionEnd('yangtai')" class="Four-image" />
25
-        <div style=" width: 21vw;; position: absolute; right: 13.5vw; top: 77vh;">
25
+        <div style=" width: 21vw;; position: absolute; right: 13.5vw; top: 70vw;">
26 26
           <img style=" width:100%;" src="../assets/fourBoxes-2/阳台-2.png" />
27 27
         </div>
28 28
       </div>
@@ -51,16 +51,14 @@ export default {
51 51
 <style lang="scss" scoped>
52 52
 .index-box {
53 53
   width: 100vw;
54
-  height: 100vh;
55 54
   display: flex;
56 55
   .bg-image {
57 56
     width: 100%;
58
-    height: 100vh;
59 57
     position: absolute;
60 58
   }
61 59
   .index-FourBoxes {
62 60
     position: relative;
63
-    top: 16vh;
61
+    top: 29vw;
64 62
     width: 98%;
65 63
     height: 84%;
66 64
     margin: 0 auto;
@@ -82,7 +80,8 @@ export default {
82 80
 
83 81
       float: left;
84 82
       width: 48%;
85
-      height: 49%;
83
+      height: 80vw;
84
+      position: relative;
86 85
       .Four-image {
87 86
         width: 100%;
88 87
         height: 100%;
@@ -90,11 +89,11 @@ export default {
90 89
     }
91 90
     &-yushi,
92 91
     &-keting {
93
-      margin-right: 4px;
92
+      margin-right: 1vw;
94 93
     }
95 94
     &-yimao,
96 95
     &-yangtai {
97
-      margin-left: 4px;
96
+      margin-left: 1vw;
98 97
     }
99 98
   }
100 99
 }

+ 1
- 2
src/pages/index.vue View File

@@ -22,7 +22,6 @@ export default {
22 22
   background-color: black;
23 23
 
24 24
   width: 100vw;
25
-  height: 100vh;
26 25
   display: flex;
27 26
   align-items: center;
28 27
 
@@ -33,7 +32,7 @@ export default {
33 32
   .bth-div {
34 33
     position: absolute;
35 34
     width: 45vw;
36
-    bottom: 18vh;
35
+    top: 143vw;
37 36
     display: flex;
38 37
     left: 27.5vw;
39 38
     align-items: center;

+ 2
- 3
src/pages/resultPage.vue View File

@@ -4,7 +4,6 @@
4 4
       class="bgi"
5 5
       src="../../public/images/result/resultbgi.jpg"
6 6
       width="100%"
7
-      height="100%"
8 7
     />
9 8
     <img
10 9
       @click="onShare"
@@ -46,11 +45,11 @@ export default {
46 45
 .sharebgi {
47 46
   z-index: 100;
48 47
   position: absolute;
49
-  height: 100vh;
48
+  height: 193vw;
50 49
 }
51 50
 .share {
52 51
   z-index: 3;
53 52
   position: absolute;
54
-  margin: 72vh 0 0 27.5vw;
53
+  margin: 139vw 0 0 27.5vw;
55 54
 }
56 55
 </style>

+ 1
- 1
src/pages/signup.vue View File

@@ -121,7 +121,7 @@ export default {
121 121
       } else if (!this.formData.address) {
122 122
         alert('请选择您所在的地区')
123 123
         return false
124
-      } else if (!this.formData.phone.match(/^1[0-9]{10}/)) {
124
+      } else if (!/^1[0-9]{10}$/.test(this.formData.phone)) {
125 125
         alert('请输入正确的手机号哦')
126 126
         return false
127 127
       } else return true