Merge branch 'master' of http://git.ycjcjy.com/H5/huaqiaocheng-h5

src/assets/css/index.scss

@@ -9,4 +9,4 @@ body, #app {
   height: 100%;
   margin: 0;
   padding: 0;
-}
+}

src/components/Modal/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <modal :name="name" :clickToClose="false" :width="width" :height="height">
+  <modal :name="name" :clickToClose="false" :width="width" :height="height" :shiftX="0" :shiftY="0" :scrollable="false">
     <slot></slot>
   </modal>
 </template>

src/views/projectIndex.vue

@@ -21,7 +21,7 @@
 
 <script>
 
-const backSignImg = require('@/assets/perjectImages/backButton.png')
+// const backSignImg = require('@/assets/perjectImages/backButton.png')
 const backSignImg2 = require('@/assets/perjectImages/backButton-2.png')
 
 export default {
@@ -108,7 +108,6 @@ export default {
   overflow-x: hidden;
   background: #ededed;
   position: relative;
-
   .index-pos-hander {
     position: absolute;
     z-index: 200;