shop uid

 'use strict';
 'use strict';
 
 
 const shopModel = require('../models/shopCollect'),
 const shopModel = require('../models/shopCollect'),
-    headerModel = require('../../../doraemon/models/header');
+    headerModel = require('../../../doraemon/models/header'),
+    _ = require('lodash');
+const crypto = global.yoho.crypto;
 
 
 const shopIndex = (req, res) => {
 const shopIndex = (req, res) => {
     let isApp = req.query.app_version || req.query.appVersion || false;
     let isApp = req.query.app_version || req.query.appVersion || false;
-
-    // let uid = req.user.uid;
+    let uid = req.user.uid;
     let parameter = {};
     let parameter = {};
 
 
     if (!isApp) {
     if (!isApp) {
@@ -15,6 +16,12 @@ const shopIndex = (req, res) => {
                 navTitle: '店铺收藏'
                 navTitle: '店铺收藏'
             })
             })
         };
         };
+    } else {
+        uid  = crypto.encryption('', req.query.uid + ''),
+        parameter = {
+            appVersion: true,
+            uid: uid
+        };
     }
     }
 
 
     shopModel.banner().then((result) => {
     shopModel.banner().then((result) => {
@@ -39,7 +46,7 @@ const shopNav = (req, res, next) => {
 
 
 
 
 const shopList = (req, res, next) => {
 const shopList = (req, res, next) => {
-    let uid = req.user.uid;
+    let uid = req.query.uid || req.user.uid || '';
     let tabName = req.query.tabName;
     let tabName = req.query.tabName;
 
 
     shopModel.shopList(uid, tabName).then((result) => {
     shopModel.shopList(uid, tabName).then((result) => {

@@ -11,4 +11,6 @@
         
         
     </div>
     </div>
 {{/ shopCollect}}
 {{/ shopCollect}}
+<input type="hidden" name="app_version" value="{{appVersion}}">
+<input type="hidden" name="uid" value="{{uid}}">
 </div>
 </div>

@@ -10,7 +10,10 @@ var searching,
     shopId,
     shopId,
     stoping,
     stoping,
     navSwiper,
     navSwiper,
-    navType;
+    bannerSwiper,
+    navType,
+    appVersion = $('input[name="app_version"]').val(),
+    uid = $('input[name="uid"]').val();
 
 
 var shopNav = require('shopCollect/shop-nav.hbs'),
 var shopNav = require('shopCollect/shop-nav.hbs'),
     shopList = require('shopCollect/shop-list.hbs');
     shopList = require('shopCollect/shop-list.hbs');
@@ -31,7 +34,8 @@ function shopListData(tabName, stoping) {
         method: 'get',
         method: 'get',
         url: '/activity/shopList',
         url: '/activity/shopList',
         data: {
         data: {
-            tabName: tabName
+            tabName: tabName,
+            uid: window.queryString.uid
         },
         },
         success: function(data) {
         success: function(data) {
 
 
@@ -68,6 +72,8 @@ function shopListData(tabName, stoping) {
                         id: shopId,
                         id: shopId,
                         opt: opt,
                         opt: opt,
                         type: 'shop',
                         type: 'shop',
+                        uid: uid,
+                        appVersion: appVersion
                     },
                     },
                     xhrFields: {
                     xhrFields: {
                         withCredentials: true
                         withCredentials: true

@@ -100,7 +100,7 @@ function inputAction() {
                 var i;
                 var i;
 
 
                 if (data.length > 0) {
                 if (data.length > 0) {
-                    console.log(data.length);
+
                     for (i = 0; i < data.length; i++) {
                     for (i = 0; i < data.length; i++) {
                         ajaxHtml += '<li><span class="keyword">' + data[i].keyword + '</span><span class="count">' +
                         ajaxHtml += '<li><span class="keyword">' + data[i].keyword + '</span><span class="count">' +
                         data[i].count + ' items<i class="iconfont">&#xe614;</i></span></li>';
                         data[i].count + ' items<i class="iconfont">&#xe614;</i></span></li>';