shop

@@ -18,11 +18,18 @@ const shopIndex = (req, res) => {
             })
         };
     } else {
-        uid = crypto.encryption('', uid + '');
-        parameter = {
-            appVersion: true,
-            uid: uid
-        };
+        if(uid) {
+            uid = crypto.encryption('', uid + ''); 
+
+            parameter = {
+                appVersion: true,
+                uid: uid
+            };
+        } else {
+            parameter = {
+                appVersion: true
+            };
+        } 
     }
 
     shopModel.banner().then((result) => {
@@ -48,7 +55,7 @@ const shopNav = (req, res, next) => {
 
 
 const shopList = (req, res, next) => {
-    let uid = req.query.uid ?  _.trim(crypto.decrypt('', req.query.uid)) : req.user.uid;
+    let uid = _.trim(crypto.decrypt('', req.query.uid)) || req.user.uid;
     let tabName = req.query.tabName;
 
     shopModel.shopList(uid, tabName).then((result) => {

@@ -30,7 +30,7 @@ function shopFav(shopIds) {
         method: 'get',
         url: '/activity/shopfavStatus',
         data: {
-            uid: window.queryString.uid || uid,
+            uid: uid,
             shopIds: shopIds
         },
         success: function(data) {
@@ -67,7 +67,7 @@ function shopListData(tabName, stoping) {
         url: '/activity/shopList',
         data: {
             tabName: tabName,
-            uid: window.queryString.uid
+            uid: uid || ''
         },
         success: function(data) {
 
@@ -119,7 +119,7 @@ function shopListData(tabName, stoping) {
                         id: shopId,
                         opt: opt,
                         type: 'shop',
-                        uid: window.queryString.uid || uid,
+                        uid: uid,
                         appVersion: appVersion
                     },
                     xhrFields: {