朋友圈 album

hehtao · Sep 20, 2016 · 0d2e5ff · 0d2e5ff
1 parent 34f86ca
commit 0d2e5ff
Show file tree

Hide file tree

Showing 16 changed files with 2,348 additions and 178 deletions.
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -24,7 +24,7 @@ module.exports = {
             'store':path.resolve(__dirname,'../src/vuex/store'),
             'getters':path.resolve(__dirname,'../src/vuex/getters'),
             'actions':path.resolve(__dirname,'../src/vuex/actions'),
-            'mock':path.resolve(__dirname,'../src/mock'),
+            'mock':path.resolve(__dirname,'../src/mock')
         }
     },
     resolveLoader: {

diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -61,7 +61,7 @@ var webpackConfig = merge(baseWebpackConfig, {
     new webpack.ProvidePlugin({
       "$":'webpack-zepto',
       "zepto":"zepto",
-      "window.zepto":"webpack-zepto"
+      "window.zepto":"webpack-zepto",
     }),
     // split vendor js into its own file
     new webpack.optimize.CommonsChunkPlugin({

diff --git a/index.html b/index.html
@@ -13,7 +13,7 @@
 </head>
 
 <body>
-    <div id="app"></div>
+    <div id="app" @touchmove.prevent=""></div>
     <!-- built files will be auto injected -->
 </body>
 

diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "babel-register": "^6.0.0",
     "connect-history-api-fallback": "^1.1.0",
     "css-loader": "^0.24.0",
+    "dynamics.js": "^1.1.5",
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
@@ -53,4 +54,4 @@
     "webpack-merge": "^0.8.3",
     "webpack-zepto": "^0.0.1"
   }
-}
+}
diff --git a/src/app.vue b/src/app.vue
@@ -49,7 +49,7 @@ export default {
         this.appload = true;
         setTimeout(() => {
             this.welcome = false;
-        }, 2500)
+        }, 500)
     },
     events: {
         'route-pipe' (_decline) {

diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss
@@ -205,6 +205,8 @@ body,
 
 ._cover-top {
     position: relative;
+    z-index: 2;
+    overflow: hidden;
     height: 45px;
     padding: 0 15px 0 10px;
     line-height: 45px;
@@ -227,12 +229,13 @@ body,
 /*initial route transition 3*/
 
 ._cover-content {
+    position: relative;
+    z-index: 1;
     padding-top: 1px;
     transition: .2s all ease-in-out;
     opacity: 1;
     transform: translate3d(0%, 0, 0);
     height: calc(100% - 45px);
-    position: relative;
     background-color: #efeff4;
     box-shadow: 0px 0 41px rgba(0,0,0,.1);
 }

diff --git a/src/assets/images/find-album-reflash-icon.png b/src/assets/images/find-album-reflash-icon.png
diff --git a/src/assets/images/find-bg.png b/src/assets/images/find-bg.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
     </head>
     <body>
-        <div id="app"></div>
+        <div id="app" @touchmove.prevent=""></div>
         <!-- built files will be auto injected -->
     </body>
@@ Expand Down @@