Merge branch 'master' of http://git.huaml.com/zhh/front-end

hd/src/pages/layout/topbar/index.vue

@@ -89,6 +89,9 @@ export default {
         }
       })
       return str
+    },
+    shopShow(){
+      return this.userInfo.super == 1 && this.shopList.length > 1
     }
 	},
 
@@ -121,8 +124,8 @@ export default {
     shopCommand(item) {
       console.log(item)
       this.$service.common.toggleShop({shopId: item.id}).then(res => {
-        console.log('res', res)
-      }).catch(err => {})
+        this.$router.go(0)
+      }).catch(err => {console.log(err,1111111)})
     },
     // 获取门店
     getAllShop() {

hd/src/service/common/index.js

@@ -247,8 +247,9 @@ export class CommonService extends BaseService {
   // 切换门店
   toggleShop(params) {  
 		return this.request({
-			url: '/shop/toggle-shop',
-			params
+      url: '/shop/toggle-shop',
+      method: 'POST',
+      data: params
 		});
 	}
 }