From b2796ed04f5520c54f00c5ae19f39d603e3c54ae Mon Sep 17 00:00:00 2001
From: maguohua <1264889788@qq.com>
Date: Sat, 4 Mar 2017 17:30:04 +0800
Subject: [PATCH] update

---
 README.md                             |   2 +
 src/page/shop/children/foodDetail.vue |  10 +-
 src/service/getData.js                | 146 ++++++++++++++------------
 3 files changed, 88 insertions(+), 70 deletions(-)

diff --git a/README.md b/README.md
index a87e29b..a978e78 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,8 @@ npm run build
 
 >  特别感谢辰妹子，在百忙之中抽出时间和我一起完成了这个项目，辛苦了🌹
 
+>  如果您发现问题并有非常好的解决方案，欢迎 PR 👍
+
 >  推荐一个 react + redux 开源项目，对react感兴趣的朋友赶紧去看看。[地址在这里](https://github.com/bailicangdu/react-pxq)
 
 >  另外一个 vue2 + vuex 的入门项目，比当前的项目简单很多，非常适合入门练习。[地址在这里](https://github.com/bailicangdu/vue2-happyfri)
diff --git a/src/page/shop/children/foodDetail.vue b/src/page/shop/children/foodDetail.vue
index 7501aa6..dda486e 100644
--- a/src/page/shop/children/foodDetail.vue
+++ b/src/page/shop/children/foodDetail.vue
@@ -30,10 +30,10 @@
 </template>
 
 <script>
-	import headTop from '../../../components/header/head'
-    import {getImgPath} from '../../../components/common/mixin'
-    import ratingStar from '../../../components/common/ratingStar'
-    import buyCart from '../../../components/common/buyCart'
+	import headTop from 'src/components/header/head'
+    import {getImgPath} from 'src/components/common/mixin'
+    import ratingStar from 'src/components/common/ratingStar'
+    import buyCart from 'src/components/common/buyCart'
 
 
     export default {
@@ -75,7 +75,7 @@
 </script>
 	
 <style lang="scss" scoped>
-    @import '../../../style/mixin';
+    @import 'src/style/mixin';
 	
 	.rating_page{
 		position: absolute;
diff --git a/src/service/getData.js b/src/service/getData.js
index d570562..7ad8af6 100644
--- a/src/service/getData.js
+++ b/src/service/getData.js
@@ -205,29 +205,11 @@ import * as hongbao from './tempdata/hongbao'
 // });
 
 
-// /**
-//  * 手机号登陆
-//  */
-
-// // export const sendLogin = (code, mobile, validate_token) => fetch('POST', '/v1/login/app_mobile', {
-// // 	code,
-// // 	mobile,
-// // 	validate_token
-// // });
-
-
-
-// /**
-//  * 获取用户信息
-//  */
-
-// // export const getUser = () => fetch('GET', '/v1/user', {});
-
 
 
-// /**
+// *
 //  * 获取图片验证码
-//  */
+ 
 
 // export const getcaptchas = () => fetch('POST', '/v1/captchas', {});
 
@@ -389,86 +371,118 @@ import * as hongbao from './tempdata/hongbao'
 
 
 
-// /**
-//  * 获取服务中心信息
-//  */
+// // /**
+// //  * 获取服务中心信息
+// //  */
 
 // export const getService = () => fetch('GET', '/m.ele.me@json/profile/explain', {});
 
 
 
+// /**
+// *兑换会员卡
+// */
+// export const vipCart= (id, number, password) => fetch('POST','/member/v1/users/' + id + '/delivery_card/physical_card/bind',{
+// 	number,
+// 	password
+// })
+
 
 
+// /**
+//  * 获取红包数量
+// */
 
+// export const getHongbaoNum= id => fetch('GET','/promotion/v2/users/' + id + '/hongbaos',{});
 
 
 
 // /**
-//  * 获取订单列表
-//  */
+//  * 获取过期红包
+// */
+
 
-// // export const getOrderList = (user_id, offset) => fetch('GET', '/bos/v2/users/' + user_id + '/orders', {
-// // 	limit: 10,
-// // 	offset,
-// // });
+// export const getExpired= id => fetch('GET','/promotion/v2/users/' + id + '/expired_hongbaos?limit=10&offset=0',{});
 
 
 // /**
-//  * 获取订单详情
-//  */
+//  * 兑换红包
+// */
 
-// // export const getOrderDetail = (user_id, orderid) => fetch('GET', '/bos/v1/users/' + user_id + '/orders/' + orderid + '/snapshot', {});
+// export const exChangeHongbao= (id, exchange_code, captcha_code) => fetch('POST','/v1/users/' + id + '/hongbao/exchange',{
+// 	exchange_code,
+// 	captcha_code,
+// });
 
 
 
 
-/**
-*个人中心里编辑地址
-*/
-//export const getAddressList = (user_id) => fetch('GET', '/v1/users/'+user_id+'/addresses')
 
-/**
-*个人中心里搜索地址
-*/
-// export const getSearchAddress=(keyword) => fetch('GET','v1/pois',{
-// 	keyword:keyword,
-// 	type:'nearby'
-// })
 
 
 
-/**
-*兑换会员卡
-*/
-// export const vipCart= (id, number, password) => fetch('POST','/member/v1/users/' + id + '/delivery_card/physical_card/bind',{
-// 	number,
-// 	password
-// })
 
 
 
-/**
- * 获取红包数量
-*/
-// export const getHongbaoNum= id => fetch('GET','/promotion/v2/users/' + id + '/hongbaos',{});
 
 
 
-/**
- * 获取过期红包
-*/
-// export const getExpired= id => fetch('GET','/promotion/v2/users/' + id + '/expired_hongbaos?limit=10&offset=0',{});
 
 
-/**
- * 兑换红包
-*/
-// export const exChangeHongbao= (id, exchange_code, captcha_code) => fetch('POST','/v1/users/' + id + '/hongbao/exchange',{
-// 	exchange_code,
-// 	captcha_code,
+// /**
+//  * 以下Api接口不需要或者不能进行反向代理
+//  */
+
+
+// /**
+//  * 获取用户信息
+//  */
+
+// export const getUser = () => fetch('GET', '/v1/user', {});
+
+
+// /**
+//  * 手机号登陆
+//  */
+
+// export const sendLogin = (code, mobile, validate_token) => fetch('POST', '/v1/login/app_mobile', {
+// 	code,
+// 	mobile,
+// 	validate_token
 // });
 
 
+// /**
+//  * 获取订单列表
+//  */
+
+// export const getOrderList = (user_id, offset) => fetch('GET', '/bos/v2/users/' + user_id + '/orders', {
+// 	limit: 10,
+// 	offset,
+// });
+
+
+// /**
+//  * 获取订单详情
+//  */
+
+// export const getOrderDetail = (user_id, orderid) => fetch('GET', '/bos/v1/users/' + user_id + '/orders/' + orderid + '/snapshot', {});
+
+
+// /**
+// *个人中心里编辑地址
+// */
+// export const getAddressList = (user_id) => fetch('GET', '/v1/users/'+user_id+'/addresses')
+
+// /**
+// *个人中心里搜索地址
+// */
+// export const getSearchAddress=(keyword) => fetch('GET','v1/pois',{
+// 	keyword:keyword,
+// 	type:'nearby'
+// })
+
+
 
 
 /**
@@ -529,11 +543,13 @@ export const exChangeHongbao= (id, exchange_code, captcha_code) => setpromise(ho
 
 
 
+/**
+ * 以下Api接口不需要或者不能进行反向代理
+ */
 
 export const getUser = () => setpromise(login.userInfo);
 export const sendLogin = (code, mobile, validate_token) => setpromise(login.userInfo);
 export const getOrderList = (user_id, offset) => setpromise(order.orderList);
 export const getOrderDetail = (user_id, orderid) => setpromise(order.orderDetail);
-
 export const getAddressList = (user_id) => setpromise(addresspart.address);
 export const getSearchAddress=(keyword) => setpromise(addDetail.addData);
-- 
GitLab