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

hd/src/mock/userInfo.js

@@ -299,7 +299,6 @@ let menu = {
 			viewPath: 'views/goods/goods-add.vue',
 			keepAlive: 0
 		},
-/*
 		{
 			id: '405',
 			parentId: '4',
@@ -311,7 +310,6 @@ let menu = {
 			viewPath: 'views/goods/freight-set.vue',
 			keepAlive: 1
 		},
-*/
 		{
 			id: '406',
 			parentId: '4',

hdApp/src/admin/goodsManage/list.vue

@@ -176,6 +176,10 @@ export default {
         {
           name: "涨价设置",
           click: () => this.$util.pageTo("/admin/goodsManage/price-increase")
+        },
+        {
+          name: "运费设置",
+          click: () => this.$util.pageTo("/admin/goodsManage/freight")
         }
       ]
     };