李志伟 3 vuotta sitten
vanhempi
commit
16355d8d3d
4 muutettua tiedostoa jossa 15 lisäystä ja 18 poistoa
  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 Näytä tiedosto

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

+ 1
- 2
src/pages/index.vue Näytä tiedosto

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

+ 2
- 3
src/pages/resultPage.vue Näytä tiedosto

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

+ 1
- 1
src/pages/signup.vue Näytä tiedosto

121
       } else if (!this.formData.address) {
121
       } else if (!this.formData.address) {
122
         alert('请选择您所在的地区')
122
         alert('请选择您所在的地区')
123
         return false
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
         alert('请输入正确的手机号哦')
125
         alert('请输入正确的手机号哦')
126
         return false
126
         return false
127
       } else return true
127
       } else return true