Merge branch 'master' into yohobuy-shop-dev-4.6-20160606

# Conflicts:
#	code/apps/common/interfaces/login.js
#	server/interfaces/common.login.js

@@ -11,13 +11,13 @@
           <li v-if="showFirst" @click="nav('1')">
             <a  href="javascript:void(0)">1</a>
           </li>
-          <li v-if="showFirst" class="disabled"><span class="ellipse">…</span></li>
+          <li v-if="showFirst&&(+pages!=6)" class="disabled"><span class="ellipse">…</span></li>
 
           <li v-for="n in draw" v-bind:class="{'active':n===currentPage}" @click="nav(n)">
             <a  href="javascript:void(0)">{{n}}</a>
           </li>
 
-          <li v-if="showLast" class="disabled"><span class="ellipse">…</span></li>
+          <li v-if="showLast&&(+pages!=6)" class="disabled"><span class="ellipse">…</span></li>
           <li v-if="showLast" @click="nav(pages)">
             <a  href="javascript:void(0)">{{pages}}</a>
           </li>
@@ -47,16 +47,13 @@
         required: true
       }
     },
-    computed:{
-      showFirst(){
-        return this.currentPage>3?true:false
-      },
-      showLast(){
-        if(this.pages-3<this.currentPage){
-          return false;
+    data(){
+        return{
+          showLast:true,
+          showFirst:true
         }
-        return true;
       },
+    computed:{
       draw(){
         var bll=this,arr=[];
         let beginNum = bll.currentPage - 2;
@@ -64,10 +61,19 @@
         if (beginNum < 1) beginNum = 1;
         let endNum = beginNum + 4;
         if (endNum > bll.pages) endNum = bll.pages;
+        let showFirst=true,showLast=true;
         for (let i = beginNum; i <= endNum; i++)
         {
+            if(i===1){
+              showFirst=false;
+            }
+            if(i===bll.pages){
+              showLast=false;
+            }
             arr.push(i);
         }
+        bll.showFirst=showFirst;
+        bll.showLast=showLast;
         return arr;
       }
     },

 {
   "name": "yohobuy-shops-fe",
-  "version": "4.6.4",
+  "version": "4.6.6",
   "description": "Construction of the presentation layer solution is based on express, handlebars",
   "main": "app.js",
   "scripts": {

@@ -120,6 +120,7 @@ module.exports = {
                         result = { code: 400, message: "该用户没有店铺" };
                     }
                     return callback(null, result);
+<<<<<<< HEAD
                 },errcallback);
             }, errcallback);
         },
@@ -134,6 +135,12 @@ module.exports = {
             }
         },
         gray: function (req, callback,common) {
+=======
+                }
+	        });
+ 		},
+        gray: function (req, callback){
+>>>>>>> master
             var result = { code: 201, message: "没有权限" };
             if (req.session && req.session.user) {
                 var user = req.session.user;

-{"name":"yohobuy-shops-fe","version":"4.6.4","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
+{"name":"yohobuy-shops-fe","version":"4.6.6","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file