Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

common/api/shop.js

@@ -103,6 +103,14 @@ export default {
 					cart_id: cart_id,
 				});
 			},
+			// 选择地区计算运费 
+			getFreight({ freight_hash, city_id, area_id }) {
+				return vm.$u.post('Buy/change_addr', {
+					freight_hash: freight_hash,
+					city_id: city_id,
+					area_id: area_id,
+				});
+			},
 			// 商品详情
 			getGoodsDetails({ id }) {
 				return vm.$u.post('Goods/goodDetails', {
@@ -114,6 +122,16 @@ export default {
 					id: id,
 					page:page
 				});
+			},
+			getStoreImgVideoList({id}){
+				return vm.$u.post('Store/getStoreImgVideoList', {
+					id: id
+				});
+			},
+			goodsInfo({id}){
+				return vm.$u.post('goods/goodsInfo', {
+					goods_id: id
+				});
 			}
         }
     }

common/api/user.js

@@ -195,7 +195,7 @@ export default {
 			},
 			// 修改绑定手机号
 			changeMemberPhone({ old_mobile, old_code, new_mobile, new_code }) {
-				return vm.$u.post('Member/changeMemberInfo', {
+				return vm.$u.post('Member/memberChangeMobile', {
 					old_mobile: old_mobile,
 					old_code: old_code,
 					new_mobile: new_mobile,
@@ -211,16 +211,57 @@ export default {
 				return vm.$u.post('Setting/CertificateInfo');
 			},
 			// 用户浏览记录
-			getBrowseList() {
-				return vm.$u.post('Member/BrowseList');
+			getBrowseList({ page }) {
+				return vm.$u.post('Member/BrowseList', {
+					page: page,
+				});
+			},
+			// 意见反馈列表 
+			getFeedbackList({ page }) {
+				return vm.$u.post('Member/feedbackList', {
+					page: page,
+				});
+			},
+			// 意见反馈-写意见
+			writeFeedback({ fb_content, fb_images }) {
+				return vm.$u.post('Member/writeFeedback', {
+					fb_content: fb_content,
+					fb_images: fb_images,
+				});
 			},
 			// 订单列表
-			getOrderList({ page }) {
-				return vm.$u.post('Goods/orderList', { page });
+			getOrderList({ page, type }) {
+				let params = { page: page };
+				if(type >= 0) Object.assign(params, {state_type: type})
+				return vm.$u.post('Goods/orderList', params);
 			},
 			// 订单详情
 			getOrderInfo({ order_id }) {
-				return vm.$u.post('Goods/orderInfo', { order_id });
+				return vm.$u.post('Goods/orderInfo', { order_id: order_id });
+			},
+			// 查询订单的评价信息
+			getOrderEvaluateInfo({ id }) {
+				return vm.$u.post('Order/getOrderEvaluateInfo', { id: id });
+			},
+			// 订单评价/修改评价
+			updateOrderEvaluate({ id, content, scores_one, scores_two, scores_three, file }) {
+				return vm.$u.post('Order/orderEvaluate', { 
+					id: id,
+					content: content,
+					scores_one: scores_one,
+					scores_two: scores_two,
+					scores_three: scores_three,
+					file: file,
+				 });
+			},
+			// 上传图片视频
+			uploadfile({ file }) {
+				const params = {
+					file: file
+				}
+				console.log(params);
+				
+				return vm.$u.post('Upload/uploadfile', params);
 			},
 			// 信息模块
 			messageIndex({ }) {