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

common/api/user.js

@@ -216,7 +216,7 @@ export default {
 					page: page,
 				});
 			},
-			// 意见反馈列表 
+			// 意见反馈列表
 			getFeedbackList({ page }) {
 				return vm.$u.post('Member/feedbackList', {
 					page: page,
@@ -230,14 +230,15 @@ export default {
 				});
 			},
 			// 订单列表
-			getOrderList({ page, type }) {
+			getOrderList({ page, type, refund_state }) {
 				let params = { page: page };
-				if(type >= 0) Object.assign(params, {state_type: type})
-				return vm.$u.post('Goods/orderList', params);
+				if(type >= 0 || typeof type == 'string') Object.assign(params, {state_type: type});
+				if(refund_state) Object.assign(params, {refund_state: refund_state});
+				return vm.$u.post('Order/orderList', params);
 			},
 			// 订单详情
 			getOrderInfo({ order_id }) {
-				return vm.$u.post('Goods/orderInfo', { order_id: order_id });
+				return vm.$u.post('Order/orderInfo', { order_id: order_id });
 			},
 			// 查询订单的评价信息
 			getOrderEvaluateInfo({ id }) {
@@ -245,23 +246,15 @@ export default {
 			},
 			// 订单评价/修改评价
 			updateOrderEvaluate({ id, content, scores_one, scores_two, scores_three, file }) {
-				return vm.$u.post('Order/orderEvaluate', { 
+				let params = {
 					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);
+				if(file) Object.assign(params, { file: file });
+				return vm.$u.post('Order/orderEvaluate', params);
 			},
 			// 信息模块
 			messageIndex({ }) {