From 6b32c113b7c2ccfaf83341c14b85646e86efdfe4 Mon Sep 17 00:00:00 2001 From: maguohua <1264889788@qq.com> Date: Wed, 24 May 2017 11:12:03 +0800 Subject: [PATCH] add a lot code --- README.md | 10 +- src/api/getData.js | 112 ++++++++++- src/config/env.js | 7 +- src/page/addGoods.vue | 20 +- src/page/addShop.vue | 55 +++++- src/page/area.vue | 15 -- src/page/foodList.vue | 423 +++++++++++++++++++++++++++++++++++++++++ src/page/manage.vue | 3 +- src/page/orderList.vue | 145 ++++++++++++++ src/page/shopList.vue | 347 ++++++++++++++++++++++++++++++++- src/page/userList.vue | 104 +++++++++- src/router/index.js | 13 +- 12 files changed, 1208 insertions(+), 46 deletions(-) delete mode 100644 src/page/area.vue create mode 100644 src/page/foodList.vue create mode 100644 src/page/orderList.vue diff --git a/README.md b/README.md index df3cec2..6a669b8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # project -此项目是 [后台项目node-elm](https://github.com/bailicangdu/node-elm) 的数据管理系统。配合[前台项目vue2-elm](https://github.com/bailicangdu/vue2-elm)组成一个 后台系统 + 数据管理 + 前台展示 的完整流程。 +此项目是后台项目[node-elm](https://github.com/bailicangdu/node-elm) 的数据管理系统。配合前台项目[vue2-elm](https://github.com/bailicangdu/vue2-elm)组成一个 后台系统 + 数据管理 + 前台展示 的完整流程。 # 说明 @@ -49,11 +49,11 @@ npm run dev - [x] 登陆/注销 - [x] 添加商铺 - [x] 添加商品 +- [x] 数据展示 +- [x] 管理用户 +- [x] 管理商铺 +- [x] 食品管理 - [ ] 权限验证 -- [ ] 数据展示 -- [ ] 管理用户 -- [ ] 管理商铺 -- [ ] 地区管理 - [ ] 管理员设置 - [ ] 图表📈 - [ ] 上传文件 diff --git a/src/api/getData.js b/src/api/getData.js index c8ec294..66ba1ae 100644 --- a/src/api/getData.js +++ b/src/api/getData.js @@ -43,5 +43,115 @@ const addCategory = data => fetch('/shopping/addcategory', data, 'POST'); const addFood = data => fetch('/shopping/addfood', data, 'POST'); -export { cityGuess, addShop, searchplace, getCategory, addCategory, addFood } +/** + * category 种类列表 + */ + +const foodCategory = (latitude, longitude) => fetch('/shopping/v2/restaurant/category'); + +/** + * 获取餐馆列表 + */ + +const getResturants = data => fetch('/shopping/restaurants', data); + +/** + * 获取餐馆详细信息 + */ + +const getResturantDetail = restaurant_id => fetch('/shopping/restaurant/' + restaurant_id); + +/** + * 获取餐馆数量 + */ + +const getResturantsCount = () => fetch('/shopping/restaurants/count'); + +/** + * 更新餐馆信息 + */ + +const updateResturant = data => fetch('/shopping/updateshop', data, 'POST'); + +/** + * 删除餐馆 + */ + +const deleteResturant = restaurant_id => fetch('/shopping/restaurant/' + restaurant_id, {}, 'DELETE'); + +/** + * 获取食品列表 + */ + +const getFoods = data => fetch('/shopping/v2/foods', data); + +/** + * 获取食品数量 + */ + +const getFoodsCount = data => fetch('/shopping/v2/foods/count', data); + + +/** + * 获取menu列表 + */ + +const getMenu = data => fetch('/shopping/v2/menu', data); + +/** + * 获取menu列表 + */ + +const getMenuById = category_id => fetch('/shopping/v2/menu/' + category_id); + +/** + * 更新食品信息 + */ + +const updateFood = data => fetch('/shopping/v2/updatefood', data, 'POST'); + +/** + * 删除食品 + */ + +const deleteFood = food_id => fetch('/shopping/v2/food/' + food_id, {}, 'DELETE'); + +/** + * 获取用户列表 + */ + +const getUserList = data => fetch('/v1/users/list', data); + +/** + * 获取用户数量 + */ + +const getUserCount = data => fetch('/v1/users/count', data); + +/** + * 获取订单列表 + */ + +const getOrderList = data => fetch('/bos/orders', data); + +/** + * 获取订单数量 + */ + +const getOrderCount = data => fetch('/bos/orders/count', data); + +/** + * 获取订单数量 + */ + +const getUserInfo = user_id => fetch('/v1/user/' + user_id); + +/** + * 获取订单数量 + */ + +const getAddressById = address_id => fetch('/v1/addresse/' + address_id); + + +export { cityGuess, addShop, searchplace, getCategory, addCategory, addFood, foodCategory ,getResturants, getResturantDetail, getResturantsCount, updateResturant, deleteResturant, getFoods, getFoodsCount, getMenu, updateFood, getMenuById, deleteFood, getUserList, getUserCount, getOrderList, getOrderCount, getUserInfo, getAddressById} diff --git a/src/config/env.js b/src/config/env.js index b01c6ca..9732f67 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -3,20 +3,21 @@ * * baseUrl: 域名地址 * routerMode: 路由模式 + * baseImgPath: 图片存放地址 * */ let baseUrl; -let routerMode; +let routerMode = 'hash'; +let baseImgPath = 'http://images.cangdu.org/'; if (process.env.NODE_ENV == 'development') { baseUrl = 'http://localhost:8001'; - routerMode = 'hash' }else{ baseUrl = 'http://cangdu.org:8001'; - routerMode = 'hash' } export { baseUrl, routerMode, + baseImgPath } \ No newline at end of file diff --git a/src/page/addGoods.vue b/src/page/addGoods.vue index 3d69a1c..0dd9408 100644 --- a/src/page/addGoods.vue +++ b/src/page/addGoods.vue @@ -50,11 +50,11 @@ - + @@ -137,12 +137,13 @@ - - diff --git a/src/page/foodList.vue b/src/page/foodList.vue new file mode 100644 index 0000000..b10453b --- /dev/null +++ b/src/page/foodList.vue @@ -0,0 +1,423 @@ + + + + + diff --git a/src/page/manage.vue b/src/page/manage.vue index 3114451..d5b4278 100644 --- a/src/page/manage.vue +++ b/src/page/manage.vue @@ -8,7 +8,8 @@ 用户列表 商家列表 - 地区管理 + 食品列表 + 订单列表 管理员列表 diff --git a/src/page/orderList.vue b/src/page/orderList.vue new file mode 100644 index 0000000..cc9404f --- /dev/null +++ b/src/page/orderList.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/page/shopList.vue b/src/page/shopList.vue index bde0949..2a1c764 100644 --- a/src/page/shopList.vue +++ b/src/page/shopList.vue @@ -1,18 +1,363 @@ diff --git a/src/page/userList.vue b/src/page/userList.vue index bde0949..375d992 100644 --- a/src/page/userList.vue +++ b/src/page/userList.vue @@ -1,18 +1,120 @@ diff --git a/src/router/index.js b/src/router/index.js index 06b2203..b070c19 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,8 @@ const addShop = r => require.ensure([], () => r(require('@/page/addShop')), 'add const addGoods = r => require.ensure([], () => r(require('@/page/addGoods')), 'addGoods'); const userList = r => require.ensure([], () => r(require('@/page/userList')), 'userList'); const shopList = r => require.ensure([], () => r(require('@/page/shopList')), 'shopList'); -const area = r => require.ensure([], () => r(require('@/page/area')), 'area'); +const foodList = r => require.ensure([], () => r(require('@/page/foodList')), 'foodList'); +const orderList = r => require.ensure([], () => r(require('@/page/orderList')), 'orderList'); const adminList = r => require.ensure([], () => r(require('@/page/adminList')), 'adminList'); const visitor = r => require.ensure([], () => r(require('@/page/visitor')), 'visitor'); const newMember = r => require.ensure([], () => r(require('@/page/newMember')), 'newMember'); @@ -52,9 +53,13 @@ export default new Router({ component: shopList, meta: ['数据管理', '商家列表'], },{ - path: '/area', - component: area, - meta: ['数据管理', '地区管理'], + path: '/foodList', + component: foodList, + meta: ['数据管理', '食品列表'], + },{ + path: '/orderList', + component: orderList, + meta: ['数据管理', '订单列表'], },{ path: '/adminList', component: adminList, -- GitLab