Merge branch 'release/1.0'

@@ -5,6 +5,6 @@
 	<div class="tips">
 	<div class="tips">
     	<span class="tip">哎呀，您访问的页面走丢了...</span>
     	<span class="tip">哎呀，您访问的页面走丢了...</span>
     	<span class="tips-english">404 File Not Found, Sorry</span>
     	<span class="tips-english">404 File Not Found, Sorry</span>
-    	<span class="home">回到首页</span>
+    	<span class="home">返回</span>
 	</div>
 	</div>
 </div>
 </div>

@@ -5,6 +5,6 @@
 	<div class="tips">
 	<div class="tips">
     	<span class="tip">哎呀，程序出错了...</span>
     	<span class="tip">哎呀，程序出错了...</span>
     	<span class="tips-english">500- Server Internal Error</span>
     	<span class="tips-english">500- Server Internal Error</span>
-    	<span class="home">回到首页</span>
+    	<span class="home">返回</span>
 	</div>
 	</div>
 </div>
 </div>

@@ -12,7 +12,6 @@ yoho.ready(() => {
 	yoho.showLoading(false);
 	yoho.showLoading(false);
 
 
 	$('.home').on('click', () => {
 	$('.home').on('click', () => {
-		interceptClick.intercept('/');
 		yoho.goBack();
 		yoho.goBack();
 	});
 	});
 });
 });

@@ -33,7 +33,7 @@ const getImgUrl = function(src, width = 300, height = 300, mode = 2) {
         };
         };
 
 
         return dict[$0];
         return dict[$0];
-    }).replace('http:', '') : '';
+    }).replace('http:', '') + '/interlace/1' : '';
 };
 };
 
 
 // 退换货 申请 成功， 打开 modal
 // 退换货 申请 成功， 打开 modal

@@ -109,6 +109,7 @@
 
 
         .go-back-btn {
         .go-back-btn {
             &:hover {
             &:hover {
+                background: #ccc;
                 opacity: 0.5;
                 opacity: 0.5;
             }
             }
         }
         }

 <template>
 <template>
-    <div class="goods-box" v-infinite-scroll="fetch()" infinite-scroll-disable="disableFetch" infinite-scroll-distance="1200">
+    <div class="goods-box" v-infinite-scroll="fetch()" infinite-scroll-disable="disableFetch" infinite-scroll-distance="0">
         <ul class="cardlist card-large clearfix">
         <ul class="cardlist card-large clearfix">
             <li class="card" v-for="item in data">
             <li class="card" v-for="item in data">
                 <div class="card-pic">
                 <div class="card-pic">
@@ -16,7 +16,7 @@
                 </div>
                 </div>
             </li>
             </li>
         </ul>
         </ul>
-        <p class="cardlist--loading text-center" v-show="state === 1">正在加载...</p>
+        <p class="cardlist--loading text-center" v-show="state === 1">loading...</p>
         <!--<p class="cardlist--end text-center" v-show="state === 0 ">--End--</p>-->
         <!--<p class="cardlist--end text-center" v-show="state === 0 ">--End--</p>-->
 
 
         <div class="empty-tip" v-show="state === -1">
         <div class="empty-tip" v-show="state === -1">
@@ -68,6 +68,12 @@
         padding: 0;
         padding: 0;
     }
     }
 
 
+    .cardlist--loading {
+        font-size: 32px;
+        text-align: center;
+        padding: 16px 0;
+    }
+
     .card-large {
     .card-large {
         background-color: #fff;
         background-color: #fff;
 
 

@@ -322,7 +322,7 @@
                         font-size: 34px;
                         font-size: 34px;
                         line-height: 72px;
                         line-height: 72px;
                         color: #fff;
                         color: #fff;
-                        background: $red;
+                        background: #ff081c;
                         text-align: center;
                         text-align: center;
                         border-radius: 50%;
                         border-radius: 50%;
                         transform: scale(0.5);
                         transform: scale(0.5);