diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php index 0ec34935b565d1b85c14c4f7fac78c8f1ec8de82..c5b9f23d06d7ea5ccb53a1234e3bc3c4e11c7d4b 100755 --- a/application/api/controller/Order.php +++ b/application/api/controller/Order.php @@ -98,6 +98,11 @@ class Order extends Common // 参数 $params = $this->data_post; $params['user'] = $this->user; + $params['user_type'] = 'user'; + if(empty($params['id'])) + { + return DataReturn('参数有误', -1); + } // 条件 $where = OrderService::OrderListWhere($params); @@ -116,6 +121,58 @@ class Order extends Common return DataReturn('数据不存在或已删除', -100); } + /** + * 评价页面 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-08 + * @desc description + */ + public function Comments() + { + // 参数 + $params = $this->data_post; + $params['user'] = $this->user; + $params['user_type'] = 'user'; + if(empty($params['id'])) + { + return DataReturn('参数有误', -1); + } + + // 条件 + $where = OrderService::OrderListWhere($params); + + // 获取列表 + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => $where, + ); + $data = OrderService::OrderList($data_params); + if(!empty($data['data'][0])) + { + return DataReturn('success', 0, $data['data'][0]); + } + return DataReturn('没有相关数据', -100); + } + + /** + * 评价保存 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-10-09 + * @desc description + */ + public function CommentsSave() + { + $params = $this->data_post; + $params['user'] = $this->user; + $params['business_type'] = 'order'; + return GoodsCommentsService::Comments($params); + } + /** * 订单支付 * @author Devil diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 3b7cc9014150e4610895deef594478f44427862b..b0eb1fb7cdbe6a949998ccdad2bfc71b4d117489 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -193,7 +193,7 @@ class BuyService $where['c.user_id'] = $params['user']['id']; $field = 'c.*, g.inventory_unit, g.is_shelves, g.is_delete_time, g.buy_min_number, g.buy_max_number, g.model'; - $data = Db::name('Cart')->alias('c')->join(['__GOODS__'=>'g'], 'g.id=c.goods_id')->where($where)->field($field)->select(); + $data = Db::name('Cart')->alias('c')->join(['__GOODS__'=>'g'], 'g.id=c.goods_id')->where($where)->field($field)->order('c.id desc')->select(); // 数据处理 diff --git a/public/appmini/old/alipay/app.acss b/public/appmini/old/alipay/app.acss index 12a80ffafd2c5cd7db97ef7a40671e8812bea9bf..a02635967176ff7f321811e9a4d5621b573c53e3 100755 --- a/public/appmini/old/alipay/app.acss +++ b/public/appmini/old/alipay/app.acss @@ -271,37 +271,37 @@ textarea { /** * 表单 */ -.form-gorup { - padding: 30rpx 10rpx; +.form-container .form-gorup { + padding: 20rpx 10rpx; + margin-bottom: 20rpx; } -.form-gorup-title { +.form-container .form-gorup-title { margin-bottom: 5rpx; font-weight: 500; } -.form-group-tips, -.form-group-tips-must { +.form-container .form-group-tips, +.form-container .form-group-tips-must { margin-left: 20rpx; font-size: 24rpx; color: #ccc; } -.form-group-tips-must { +.form-container .form-group-tips-must { color: #f00; } -.form-gorup input, -.form-gorup textarea, -.form-gorup picker view.picker { - border-bottom: 1px solid #eee; +.form-container .form-gorup input, +.form-container .form-gorup textarea, +.form-container .form-gorup picker view.picker { border-radius: 0; width: 100%; box-sizing: border-box; padding: 0 10rpx; } -.form-gorup input, -.form-gorup picker view.picker { +.form-container .form-gorup input, +.form-container .form-gorup picker view.picker { height: 70rpx; line-height: 70rpx; } -.form-gorup textarea { +.form-container .form-gorup textarea { padding: 0; min-height: 70rpx; } diff --git a/public/appmini/old/alipay/pages/buy/buy.js b/public/appmini/old/alipay/pages/buy/buy.js index 074c2a7e255779f34dc7d786a87c555b7edd06f1..a0becfd1dc9b5bba5e4729d0e54d621847fb35a0 100755 --- a/public/appmini/old/alipay/pages/buy/buy.js +++ b/public/appmini/old/alipay/pages/buy/buy.js @@ -192,7 +192,7 @@ Page({ this.init(); }, - // 支付方式数据处理 + // 支付方式数据处理 payment_list_data(data) { if (this.data.payment_id != 0) { for (var i in data) { diff --git a/public/appmini/old/alipay/pages/goods-search/goods-search.axml b/public/appmini/old/alipay/pages/goods-search/goods-search.axml index 75d6526e418f5cad6e10cfd1b4416a3d6af03b4a..87c6416c6793a90bbec087cb2469a61df1db9892 100755 --- a/public/appmini/old/alipay/pages/goods-search/goods-search.axml +++ b/public/appmini/old/alipay/pages/goods-search/goods-search.axml @@ -50,7 +50,7 @@ 关键字 - + diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js index 2b3291ae21651f3535b580fb2087d2682a9a852c..627e16770a770c9487081a3cd619cb8c5918724d 100644 --- a/public/appmini/old/alipay/pages/index/index.js +++ b/public/appmini/old/alipay/pages/index/index.js @@ -84,7 +84,7 @@ Page({ }); }, - // 搜索事件 + // 搜索事件 search_input_event(e) { var keywords = e.detail.value || null; if (keywords == null) { diff --git a/public/appmini/old/alipay/pages/paytips/paytips.js b/public/appmini/old/alipay/pages/paytips/paytips.js index be51ad1e3deb6e3d2205c5ad7af138a632ed811b..878c885ab79ab3a91f4bfc9f95c44abf8cb93daf 100755 --- a/public/appmini/old/alipay/pages/paytips/paytips.js +++ b/public/appmini/old/alipay/pages/paytips/paytips.js @@ -49,13 +49,13 @@ Page({ msg = '用户取消支付'; break; - // 默认错误 + // 默认错误 default : msg = '其它异常错误'; } options['msg'] = msg; - // 设置信息 + // 设置信息 this.setData({params: options}); }, diff --git a/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml b/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml index 35d673bc4bea82f007c8fa67fefa6be5be9294ad..849b4365dec9fbed2b737d3dfde13267a97b7afb 100755 --- a/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml +++ b/public/appmini/old/alipay/pages/user-address-save/user-address-save.axml @@ -28,7 +28,7 @@ - + diff --git a/public/appmini/old/alipay/pages/user-integral/user-integral.axml b/public/appmini/old/alipay/pages/user-integral/user-integral.axml index c79dedc2dab9cae907dfbb17ca080e0a4db797c7..2a19935d9d27b0f7b7229fc138ecd44fe7d2cbcb 100755 --- a/public/appmini/old/alipay/pages/user-integral/user-integral.axml +++ b/public/appmini/old/alipay/pages/user-integral/user-integral.axml @@ -8,7 +8,7 @@ 原始 {{item.original_integral}} - 最新 {{item.new_integral}} + 最新 {{item.new_integral}} {{item.msg}} diff --git a/public/appmini/old/alipay/pages/user-order/user-order.js b/public/appmini/old/alipay/pages/user-order/user-order.js index 3916f3ea057e182697984f380a4add789669b31d..2b7b1477a1c799dbdacbd5f0b9e4590622201c75 100755 --- a/public/appmini/old/alipay/pages/user-order/user-order.js +++ b/public/appmini/old/alipay/pages/user-order/user-order.js @@ -202,7 +202,7 @@ Page({ }); }, - // 支付弹窗关闭 + // 支付弹窗关闭 payment_popup_event_close(e) { this.setData({ is_show_payment_popup: false }); }, diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml index 66a0776227e65d447e4245d554b2f2afd8231a2e..c4c931806984da510c2bfc5a6d43ff3b16f29bc3 100644 --- a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml +++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml @@ -95,8 +95,8 @@ - - + + 退款原因必选 @@ -105,22 +105,22 @@ - + 商品件数不能大于{{returned_data.returned_quantity}}数量 - + 退款金额不能大于{{returned_data.refund_price}}元 - + 退款说明必填