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

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

@@ -10,16 +10,23 @@
 			</div>
 			<!-- <icon-svg name="icon-menu"></icon-svg> -->
 		</div>
-
 		<!-- <el-menu :default-active="index" mode="horizontal" @select="onSelect">
 			<el-menu-item v-for="(item, index) in this.menuGroup" :index="`${index}`" :key="index">
 				<icon-svg v-if="item.icon" :name="item.icon"></icon-svg>
 				<span>{{ item.name }}</span>
 			</el-menu-item>
 		</el-menu> -->
-
-		<div class="flex1"></div>
-
+    <el-dropdown class="user_top" trigger="click"> 
+		  <div  @click="chanceUser">23333&nbsp;<i class="el-icon-caret-bottom"></i></div>
+      <el-dropdown-menu slot="dropdown" class="popper-dropdown-menu-user">
+        <el-dropdown-item>黄金糕</el-dropdown-item>
+        <el-dropdown-item>狮子头</el-dropdown-item>
+        <el-dropdown-item>螺蛳粉</el-dropdown-item>
+        <el-dropdown-item>双皮奶</el-dropdown-item>
+        <el-dropdown-item>蚵仔煎</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <div class="flex1"></div>
 		<!-- <ul class="tools">
 			<li-notice></li-notice>
 		</ul> -->
@@ -87,7 +94,10 @@ export default {
 
 		// 	this.$router.push(url);
 		// },
-
+    // 选择门店
+    chanceUser() {
+      console.log(1111)
+    },
 		onCommand(name) {
 			switch (name) {
 				case 'my':
@@ -185,6 +195,12 @@ export default {
 	.flex1 {
 		flex: 1;
 	}
+  .user_top{
+    min-width: 100px;
+    margin-left: 50px;
+    cursor: pointer;
+    color: #fff;
+  }
 
 	.tools {
 		margin-right: 40px;

hd/src/views/goods/category.vue

@@ -89,6 +89,8 @@
 				<el-button type="primary" size="small" @click="confirmFn">确认</el-button>
 			</div>
 		</el-dialog>
+    <el-dropdown trigger="click" :hide-on-click="false" @command="onCommand">
+    </el-dropdown>
 	</div>
 </template>