Merge branch 'master' of http://git.ycjcjy.com/dianyang/colmo-h5

src/pages/Test.vue

@@ -66,29 +66,30 @@ export default {
     position: absolute;
   }
   .body-swiper {
-    display: none;
-    position: relative;
+    position: absolute;
     width: 100%;
-    top: 49vh;
-    height: 45vh;
+    top: 335px;
+    height: 50vh;
     display: flex;
     &-left,
     &-right {
       display: flex;
       align-items: center;
       margin: 0 auto;
-      height: 40vh;
+      height: 33vh;
       z-index: 2;
     }
     &-middle {
       width: 84%;
       overflow: hidden;
+      position: relative;
+      top: 20px;
     }
     .button-img {
       width: 40%;
       position: absolute;
-      bottom: -5vh;
-      left: 29vw;
+      bottom: 0px;
+      left: 115px;
     }
   }
 }

src/pages/index.vue

@@ -26,7 +26,7 @@ export default {
   height: 100vh;
   display: flex;
   align-items: center;
-  overflow: hidden;
+  // overflow: hidden;
 
   .bg-image {
     width: 100%;

src/pages/signup.vue

@@ -11,34 +11,19 @@
         <div style="float: right;margin-right: 7vw;" @click="handleUser">
           <img class="checkedImg" :src="ischecked ? checked : Unchecked" />
           <label for="huey">用户</label>
-        </div>        
+        </div>
       </div>
       <div class="formItem name">
         <label>姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</label>
-        <input
-          class="userName"
-          type="text"
-          placeholder="请输入姓名"
-          v-model="formData.userName"
-        />
+        <input class="userName" type="text" placeholder="请输入姓名" v-model="formData.userName" />
       </div>
       <div class="formItem phonediv">
         <label>手&nbsp;机&nbsp;号</label>
-        <input
-          class="phone"
-          type="text"
-          placeholder="请输入手机号"
-          v-model="formData.phone"
-        />
+        <input class="phone" type="text" placeholder="请输入手机号" v-model="formData.phone" />
       </div>
       <div class="formItem phonediv">
         <label>手&nbsp;机&nbsp;号</label>
-        <input
-          class="phone"
-          type="text"
-          placeholder="请输入手机号"
-          v-model="formData.phone"
-        />
+        <input class="phone" type="text" placeholder="请输入手机号" v-model="formData.phone" />
       </div>
       <div class="formItem intendedProductdiv">
         <label>意向产品</label>
@@ -51,19 +36,9 @@
       </div>
       <div class="formItem addressdiv" @click="showArea = true">
         <label>所在地区</label>
-        <input
-          class="address"
-          type="text"
-          placeholder="请选择"
-          v-model="formData.address"
-        />
+        <input class="address" type="text" placeholder="请选择" v-model="formData.address" />
       </div>
-      <img
-        @click="sumbit"
-        class="submit"
-        src="../../public/images/signup/submit.png"
-        width="45%"
-      />
+      <img @click="sumbit" class="submit" src="../../public/images/signup/submit.png" width="45%" />
     </div>
   </div>
 </template>