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

.eslintignore

@@ -1,4 +1,4 @@
-/build/
+/public/
 /config/
 /dist/
 /*.js

package.json

@@ -5,10 +5,10 @@
   "author": "Baozhangchao <3257874327@qq.com>",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 0.0.0.0",
+    "dev": "webpack-dev-server --inline --progress --config public/webpack.dev.conf.js --host 0.0.0.0",
     "start": "npm run dev",
     "lint": "eslint --ext .js,.vue src",
-    "build": "node build/build.js"
+    "build": "node public/build.js"
   },
   "dependencies": {
     "vue": "^2.5.2",

src/pages/AllPages.vue

@@ -1,27 +1,27 @@
 <template>
   <div class="index-box">
-    <img src="../../build/fourBoxes-image/1.jpg" class="bg-image" />
+    <img src="../../public/fourBoxes-image/1.jpg" class="bg-image" />
     <div class="index-FourBoxes">
       <div class="index-FourBoxes-yushi test" @click="goYuShi">
-        <img src="../../build/fourBoxes-image/浴室.png" class="Four-image" />
+        <img src="../../public/fourBoxes-image/浴室.png" class="Four-image" />
         <div style=" width: 108px; position: absolute; left: 10.8vw; top: 35vh;">
           <img style=" width:100%;" src="../assets/fourBoxes-2/浴室-2.png" />
         </div>
       </div>
       <div class="index-FourBoxes-yimao test">
-        <img src="../../build/fourBoxes-image/衣帽间.png" class="Four-image" />
+        <img src="../../public/fourBoxes-image/衣帽间.png" class="Four-image" />
         <div style=" width: 108px; position: absolute; left: 59.8vw; top: 35vh;">
           <img style=" width:100%;" src="../assets/fourBoxes-2/衣帽间-2.png" />
         </div>
       </div>
       <div class="index-FourBoxes-keting test">
-        <img src="../../build/fourBoxes-image/客厅.png" class="Four-image" />
+        <img src="../../public/fourBoxes-image/客厅.png" class="Four-image" />
         <div style=" width: 108px; position: absolute; left: 10.8vw; top: 77vh;">
           <img style=" width:100%;" src="../assets/fourBoxes-2/客厅-2.png" />
         </div>
       </div>
       <div class="index-FourBoxes-yangtai test">
-        <img src="../../build/fourBoxes-image/阳台.png" class="Four-image" />
+        <img src="../../public/fourBoxes-image/阳台.png" class="Four-image" />
         <div style=" width: 108px; position: absolute; left: 59.8vw; top: 77vh;">
           <img style=" width:100%;" src="../assets/fourBoxes-2/阳台-2.png" />
         </div>

src/pages/IndexImage.vue

@@ -4,18 +4,18 @@
     <div class="index-inner-swiper">
       <swiper :options="swiperOptions">
         <swiper-slide class="index-inner-slide">
-          <img src="../../build/yushi-image/2.png" />
+          <img src="../../public/yushi-image/2.png" />
         </swiper-slide>
 
         <swiper-slide class="index-inner-slide">
-          <img src="../../build/yushi-image/3.png" />
+          <img src="../../public/yushi-image/3.png" />
         </swiper-slide>
 
         <swiper-slide class="index-inner-slide">
-          <img src="../../build/yushi-image/4.png" />
+          <img src="../../public/yushi-image/4.png" />
         </swiper-slide>
         <swiper-slide class="index-inner-slide">
-          <img src="../../build/yushi-image/4.png" />
+          <img src="../../public/yushi-image/4.png" />
         </swiper-slide>
       </swiper>
     </div>

src/pages/Test.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="index-box">
-    <img src="../../build/yushi-image/1.jpg" class="bg-image" />
+    <img src="../../public/yushi-image/1.jpg" class="bg-image" />
     <!-- 透明返回按钮 -->
     <div style=" position: absolute;width: 55px;height: 52px;" @click="$router.go(-1)"></div>
     <!-- 透明返回按钮 -->