From 3aaa31cc43ce2d43d0e864d7f96a295d0f153fbf Mon Sep 17 00:00:00 2001 From: devil_gong Date: Fri, 23 Nov 2018 17:59:58 +0800 Subject: [PATCH] search --- alipay/app.json | 4 +- alipay/images/search-asc-icon.png | Bin 0 -> 3041 bytes alipay/images/search-default-icon.png | Bin 0 -> 2900 bytes alipay/images/search-desc-icon.png | Bin 0 -> 2979 bytes alipay/images/search-submit-icon.png | Bin 0 -> 3718 bytes alipay/pages/cart/cart.js | 10 +- alipay/pages/goods-search/goods-search.acss | 64 ++++++- alipay/pages/goods-search/goods-search.axml | 31 ++++ alipay/pages/goods-search/goods-search.js | 58 +++++- alipay/pages/goods-search/goods-search.json | 5 +- alipay/pages/index/index.acss | 30 ++++ alipay/pages/index/index.axml | 8 + alipay/pages/index/index.js | 14 ++ alipay/pages/user-order/user-order.js | 4 +- .../Api/Controller/BuyController.class.php | 4 +- .../Api/Controller/CommonController.class.php | 6 +- .../Api/Controller/OrderController.class.php | 166 +++--------------- .../Service/SearchService.class.php | 16 +- 18 files changed, 256 insertions(+), 164 deletions(-) create mode 100644 alipay/images/search-asc-icon.png create mode 100644 alipay/images/search-default-icon.png create mode 100644 alipay/images/search-desc-icon.png create mode 100644 alipay/images/search-submit-icon.png diff --git a/alipay/app.json b/alipay/app.json index c851a018e..dd26eea6a 100755 --- a/alipay/app.json +++ b/alipay/app.json @@ -1,5 +1,5 @@ { - "pages": [ + "pages": ["pages/goods-search/goods-search", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -8,7 +8,7 @@ "pages/login/login", "pages/paytips/paytips", - "pages/goods-search/goods-search", + "pages/goods-detail/goods-detail", "pages/goods-attribute/goods-attribute", "pages/buy/buy", diff --git a/alipay/images/search-asc-icon.png b/alipay/images/search-asc-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0b16b29ca9b01ee5ae30d204bd0e8e83bbf6da1c GIT binary patch literal 3041 zcmWkw2{@G97r*ZeLuTyJgwYtGrq33YsA>3KUy-GvBw;MsBKxkqStmj%L}p?TAu3r@ zMz+5sq>^mYNMsk;QvTyU&%O6~&i$Qp?mg!|zjJP!GCM9TBqIa>5H>mipW*Gu))d6> z)+UNW2LRY2BUs-u#BPRh*;DSLR9jc3!;DUS{Xtfd2c+*VQOr_SP)cTf(7Thr%^;WK z65P7&w9&p(zo9IY!FF;js?x)7?|kmrkK}XMpOvfMp6-O{-* zYOd8N;e7bGvi-Z(Mn;&KdV2mluBXJE1G05tYVvpl6OTYN zAan6LM*V>vKzDP5v_sYgA>M&iPGiTo2pfDzLA9MLs}CqWV-3OfR3tWL)gFXM9-V9X zWL?2*BIr>PSXoS_ywh-fD1kYCbtm{v$VmpiclGh3gd@s z02+)2nRHUPXoHeoVX?Z!^we7 zs1(9KotZ)=4B>hWx&i!Qs$oj#GZgPcYj(Ps~r~I4{*YQi2 znpXFb?34=xds>}yyZ4QSr&~luZjzfc^37D?Z#8B2`)(h{YdUTNk1vK^bC1~QLP8jx zJ@C?%pA$VL^GSzVot;e9FIDtgi7jB-b>eYNHOdUL%SV-rzWXKHOamgwbGGh6afLpT z+83{Q3{*~~kbR%^PZx?WjF2_Odfqtie_`nuGbXDC5~}|2fx&_T8cQWL_I34HN1oLy z@U+DZefU^_?aB+X=IftHQa~~NmnpoFS><@6N(CFMmKIWbaaIq^OQzxBrRP(1)sLD5 zI}RNLcRj=Tp(9ujSLV2lQ(M*8c$U22SIf)9Jlz;aT7S$#7H=V?ft*d1=kR&bQ`ax| zkEDLo0*+rjMA(nUhUMXnyE;QOX&iFCJPSo75L64&)2%Gi!?n`>2b%E!#ZL9wlm}NN z3irA;0(xMHwE!>ryA;`1x!cE7@!)CD0Vv1Kx*E-j^gj9_8WQV}Jq%hbCr{Gw(SVlF zYf(W1&Fh9j?4C; z_WZd^R&xl$VyLBdZs6vZpyRP_hlt9}?lDeV4-n=@99_rLX!uB|IbSDs{vV!h)fZ@w zs%=*O!-sufL5usfsdDSm9{h;3n#pz>n_xw1e8|N7mY3EGyw6ukfv2TKWs~^P#81|; zz_24sP;8g9=uXC#-~tvDSQaPZni~2gOL*}xkKYdp-o2Y@*Zwn5-^u;T+Oi$C57O{$ z85ul+0~rbNLN5AXPJyiw9m;U;1oV#>{toDwGfP2u#JYUOpaYROf3S3=+V%IzcaYB1n|cR$$tIuLXO-MO%f{WXe3W8I_yc z)MDu&iO#VYdgRoOrVW%sY?AF>iJo|*rpC+1r+n8PsJmeLt?xJJNog=x5K?uQ5LYO3 zmz9ff*)NaIF|>9NlL8_?!s@X%W-qI5e^jtKF%*=M^!==Hf(=ZIOrLn)|E@W4@IW!EkOqKC*Gb_n+s z5VUc4g()(2cqMs0&15~P20hUiP)v^yX7_=fThamBXMw)doeCa}6R64APhQrbV;*ai zql(Ymvx3gH=a10!kZY!)Qp8;M$GTK+@43?c3RiU{))ak$)TGgRV?s>)C8usSa<_5j z`&f09Q;_(CdBn++iJRsHf9*e3o7`q@TK@XZ8^674$I?^Df;j3;Ffli`$wv}V;0}_N zmo-4Cubiv7R8?=52GE3Z8X7hwnl$V%2+?L*o*yYl9^J5zMq!8;fWzUQhcL&zE32uF zB+;~vu`ch=Prk;)s2>v}NvKXIvbRdi>|kvqKx7STO;!$z56#rg-r4_m5b_v=cvPki zI3k(t_m>n{8Mb}4B*|!~NCEVF21%00Ua{ka=CD&i&jFzL%`5GUh9PSNy5$E-az< zjz(Pc=Jy_`no01h-Owf3u}&VM@SEg059(6w?d{)dn{Kvteymg8w9Hm$^F6a)vla~p z2-C72j)o3j0q6hGI<2)v zH=ujBmVQ+Gv9F=S8-Y`w2zQe@0gOhbH{O1;S~%hz7#zG}md3$R|Dc}q_-5OswXa;= ziLCQ+G~0YuPwS|RkSgtlhH5k#I1n~1d?ar1T0qg$~ z?sO4ygrr8_L-YyTUhN$Pz3!VvL@xmzYy!XmDDfSKlPl~8-aZg&2F-GS^pozEHtCmA z4()Ex)zsmS=LYn zKvX8M?PnFZoxDG@IbyLBNojA0w>o_LzFb>qy|Im#%OJ$$q9x4p$L#R^KbFBh|d;w5i1v&zcKf|V?Kxvhkp zg9PHwG5KK7K6g@(z>bU<80lAhKV~-soqAU4Eyh(>8uxndb=l9y=dtlk&x7GRNR(WO z(Exi=U02}H@xT^~B*_5__UVobGYWr=p0ZW$L`NGpJRDnGQzLyTzSou?-kBaA*asEm zR+3~#>dq%7WJqZ2Dko>@Hp9# zVLui+OnJ02add8~-S)-7sZ(Aw8t02~!Ougm318B2c<#`F1D)l+{L0nz*nE8HmFZ#v zQG(|1AFtTgbwmnjAcE4sq%$S@8NX^9k_Lo6zT7}1@BH79PXyYtR7Y~)J_Sk=-C`y? z)TI$lsjjLXNwleQYpBfXbkU-(UIuPu24f9qM7H%#{n?wgl}5IJW91*v|Lk%-%n}9C zrl)OVL6A(^o0SVZaxSk6+tzeZ?NADRUCj5dXYPChG95aL^`}pG=>JLyTey?D%;VDPGr`&4)oCHy?hPdLG5%sL}hnIb;3;Za(0z03IDbnQ$FV Q;I;0+$j}TfGoVHNA4t@Gy#N3J literal 0 HcmV?d00001 diff --git a/alipay/images/search-default-icon.png b/alipay/images/search-default-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d91a76411e25c600b21126eb2bf1c338e2c23275 GIT binary patch literal 2900 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 Z1B8bc7epFE?0MZXFga_ED>rh9`X9suQV{?E literal 0 HcmV?d00001 diff --git a/alipay/images/search-desc-icon.png b/alipay/images/search-desc-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9e79244e980730cf0ada2ee25b59e1bcc24f945a GIT binary patch literal 2979 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 Kj#_W(lk`7{N;J&? literal 0 HcmV?d00001 diff --git a/alipay/images/search-submit-icon.png b/alipay/images/search-submit-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..af52059811973ec56982a2db531629e25fd8b34a GIT binary patch literal 3718 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 B@I?Rs literal 0 HcmV?d00001 diff --git a/alipay/pages/cart/cart.js b/alipay/pages/cart/cart.js index 7703c7258..99a3bcbba 100644 --- a/alipay/pages/cart/cart.js +++ b/alipay/pages/cart/cart.js @@ -105,15 +105,15 @@ Page({ // 数量输入事件 goods_buy_number_blur(e) { - var index = e.currentTarget.dataset.index || 0; + var index = e.target.dataset.index || 0; var buy_number = parseInt(e.detail.value) || 1; this.goods_buy_number_func(index, buy_number); }, // 数量操作事件 goods_buy_number_event(e) { - var index = e.currentTarget.dataset.index || 0; - var type = parseInt(e.currentTarget.dataset.type) || 0; + var index = e.target.dataset.index || 0; + var type = parseInt(e.target.dataset.type) || 0; var temp_buy_number = parseInt(this.data.data_list[index]['stock']); if (type == 0) { var buy_number = temp_buy_number - 1; @@ -280,7 +280,7 @@ Page({ // 选中处理 selectedt_event(e) { - var type = e.currentTarget.dataset.type || null; + var type = e.target.dataset.type || null; if (type != null) { var temp_data_list = this.data.data_list; @@ -296,7 +296,7 @@ Page({ // 节点操作 case 'node' : - var index = e.currentTarget.dataset.index || 0; + var index = e.target.dataset.index || 0; temp_data_list[index]['selected'] = (temp_data_list[index]['selected'] == true) ? false : true; break; } diff --git a/alipay/pages/goods-search/goods-search.acss b/alipay/pages/goods-search/goods-search.acss index 840f46a66..789f4205c 100755 --- a/alipay/pages/goods-search/goods-search.acss +++ b/alipay/pages/goods-search/goods-search.acss @@ -1,4 +1,6 @@ -/* 商品列表 */ +/** + * 商品列表 + */ .data-list { overflow: hidden; } @@ -25,4 +27,64 @@ .data-list .items .base, .data-list .items .base .price { margin-top: 15rpx; +} + +/** + * 条件 + */ +.popup-form { + height: calc(100vh - 20rpx); + padding: 20rpx 20rpx 0 20rpx; +} +.popup-form input { + font-size: 24rpx; + height: 50rpx; + line-height: 50rpx; + background: #efefef; +} +.screening-price input { + width: 220rpx; +} +.screening-price .separator { + margin-top: 20rpx; + width: 30rpx; +} +.popup-form .keywords input { + width: 490rpx; +} +.popup-form .item:not(:last-child) { + margin-bottom: 50rpx; +} +.popup-form .item .title { + margin-bottom: 10rpx; + font-size: 28rpx; +} +.popup-form .form-submit { + height: 80rpx; + line-height: 80rpx; + position: absolute; + left: 0; + bottom: 0; + border-radius: 0; +} + +/** + * 排序导航 + */ +.nav-sort-content .item { + height: 60rpx; + line-height: 60rpx; + width: 160rpx; +} +.nav-sort-content .item .icon { + width: 30rpx; + height: 30rpx; + vertical-align: middle; +} +.screening-submit { + width: 45rpx; + height: 45rpx; + position: absolute; + top: 10rpx; + right: 20rpx; } \ No newline at end of file diff --git a/alipay/pages/goods-search/goods-search.axml b/alipay/pages/goods-search/goods-search.axml index 78b1a04b2..3bae675f3 100755 --- a/alipay/pages/goods-search/goods-search.axml +++ b/alipay/pages/goods-search/goods-search.axml @@ -1,3 +1,34 @@ + + + + + + {{item.name}} + + + + + + + + + +
+ + 价格区间(元) + + ~ + + + + 关键字 + + + +
+ + + diff --git a/alipay/pages/goods-search/goods-search.js b/alipay/pages/goods-search/goods-search.js index a66800867..9f5dbaaf6 100755 --- a/alipay/pages/goods-search/goods-search.js +++ b/alipay/pages/goods-search/goods-search.js @@ -7,10 +7,18 @@ Page({ data_page_total: 0, data_page: 1, params: null, + post_data: {}, + is_show_popup_form: false, + popup_form_loading_status: false, + search_nav_sort_list: [ + { name: "综合", field: "default", sort: "asc", "icon": null }, + { name: "销量", field: "sales_count", sort: "asc", "icon": "default" }, + { name: "价格", field: "price", sort: "asc", "icon": "default" }, + ], }, onLoad(params) { - this.setData({params: params}); + this.setData({params: params, post_data: params}); this.init(); }, @@ -128,4 +136,52 @@ Page({ scroll_lower(e) { this.get_data_list(); }, + + // 搜索条件 + form_submit_event(e) { + this.setData({ post_data: e.detail.value, data_page: 1}); + this.popup_form_event_close(); + this.get_data_list(1); + }, + + // 筛选条件关闭 + popup_form_event_close(e) { + this.setData({ is_show_popup_form: false}); + }, + + // 筛选条件开启 + popup_form_event_show(e) { + this.setData({ is_show_popup_form: true }); + }, + + // 筛选 + nav_sort_event(e) { + var index = e.target.dataset.index || 0; + var temp_post_data = this.data.post_data; + var temp_search_nav_sort = this.data.search_nav_sort_list; + var temp_sort = (temp_search_nav_sort[index]['sort'] == 'desc') ? 'asc' : 'desc'; + for (var i in temp_search_nav_sort) { + if(i != index) { + if (temp_search_nav_sort[i]['icon'] != null) { + temp_search_nav_sort[i]['icon'] = 'default'; + } + temp_search_nav_sort[i]['sort'] = 'desc'; + } + } + + temp_search_nav_sort[index]['sort'] = temp_sort; + if (temp_search_nav_sort[index]['icon'] != null) { + temp_search_nav_sort[index]['icon'] = temp_sort; + } + + temp_post_data['order_by_field'] = temp_search_nav_sort[index]['field']; + temp_post_data['order_by_type'] = temp_sort; + + this.setData({ + post_data: temp_post_data, + search_nav_sort_list: temp_search_nav_sort, + data_page: 1, + }); + this.get_data_list(1); + }, }); diff --git a/alipay/pages/goods-search/goods-search.json b/alipay/pages/goods-search/goods-search.json index c96031fd7..55e2d05af 100755 --- a/alipay/pages/goods-search/goods-search.json +++ b/alipay/pages/goods-search/goods-search.json @@ -1,3 +1,6 @@ { - "pullRefresh": true + "pullRefresh": true, + "usingComponents": { + "popup": "mini-antui/es/popup/index" + } } \ No newline at end of file diff --git a/alipay/pages/index/index.acss b/alipay/pages/index/index.acss index e6e3cf036..79c208f5d 100755 --- a/alipay/pages/index/index.acss +++ b/alipay/pages/index/index.acss @@ -1,3 +1,33 @@ +/** + * 搜索 + */ +.search { + left: 0; + top: 20rpx; + box-sizing: border-box; + padding: 15rpx 20rpx; + background: #d2364c; +} +.search-content { + border-radius: 6rpx; + position: relative; +} +.search icon { + position: absolute; + left: 10rpx; + top: 10rpx; +} +.search input { + font-size: 28rpx; + padding-left: 50rpx; + box-sizing: border-box; + height: 60rpx; + line-height: 60rpx; +} + + /** + * 楼层数据 + */ .floor-list, .floor-left { overflow: hidden; position: relative; diff --git a/alipay/pages/index/index.axml b/alipay/pages/index/index.axml index a7ae13848..fa56d0336 100755 --- a/alipay/pages/index/index.axml +++ b/alipay/pages/index/index.axml @@ -1,3 +1,11 @@ + + + + + + + + diff --git a/alipay/pages/index/index.js b/alipay/pages/index/index.js index d9fccb386..c2d9b60a6 100755 --- a/alipay/pages/index/index.js +++ b/alipay/pages/index/index.js @@ -72,6 +72,20 @@ Page({ }); }, + // 搜索事件 + search_input_event(e) { + var keywords = e.detail.value || null; + if (keywords == null) { + my.showToast({content: '请输入搜索关键字'}); + return false; + } + + // 进入搜索页面 + my.navigateTo({ + url: '/pages/goods-search/goods-search?keywords='+keywords + }); + }, + // 下拉刷新 onPullDownRefresh() { this.init(); diff --git a/alipay/pages/user-order/user-order.js b/alipay/pages/user-order/user-order.js index 1bff97e2b..1b05d5826 100755 --- a/alipay/pages/user-order/user-order.js +++ b/alipay/pages/user-order/user-order.js @@ -293,7 +293,7 @@ Page({ if (res.data.code == 0) { var temp_data_list = this.data.data_list; temp_data_list[index]['status'] = 5; - temp_data_list[index]['status_text'] = '已取消'; + temp_data_list[index]['status_name'] = '已取消'; this.setData({data_list: temp_data_list}); my.showToast({ @@ -346,7 +346,7 @@ Page({ if (res.data.code == 0) { var temp_data_list = this.data.data_list; temp_data_list[index]['status'] = 4; - temp_data_list[index]['status_text'] = '已完成'; + temp_data_list[index]['status_name'] = '已完成'; this.setData({data_list: temp_data_list}); my.showToast({ diff --git a/service/Application/Api/Controller/BuyController.class.php b/service/Application/Api/Controller/BuyController.class.php index ec6f2121e..2b9eea2fe 100755 --- a/service/Application/Api/Controller/BuyController.class.php +++ b/service/Application/Api/Controller/BuyController.class.php @@ -48,7 +48,7 @@ class BuyController extends CommonController public function Index() { // 获取商品列表 - $params = $_POST; + $params = $this->data_post; $params['user'] = $this->user; $ret = BuyService::BuyTypeGoodsList($params); @@ -94,7 +94,7 @@ class BuyController extends CommonController */ public function Add() { - $params = $_POST; + $params = $this->data_post; $params['user'] = $this->user; $ret = BuyService::OrderAdd($params); $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); diff --git a/service/Application/Api/Controller/CommonController.class.php b/service/Application/Api/Controller/CommonController.class.php index 1aec036a0..1ba5451fa 100755 --- a/service/Application/Api/Controller/CommonController.class.php +++ b/service/Application/Api/Controller/CommonController.class.php @@ -46,9 +46,9 @@ class CommonController extends Controller $this->CommonInit(); // 输入参数 - $this->data_post = I('post.'); - $this->data_get = I('get.'); - $this->data_request = I('request.'); + $this->data_post = $_POST; + $this->data_get = $_GET; + $this->data_request = $_REQUEST; } /** diff --git a/service/Application/Api/Controller/OrderController.class.php b/service/Application/Api/Controller/OrderController.class.php index 27749582d..7d092454e 100755 --- a/service/Application/Api/Controller/OrderController.class.php +++ b/service/Application/Api/Controller/OrderController.class.php @@ -130,34 +130,16 @@ class OrderController extends CommonController */ public function Cancel() { - if(empty($this->data_post['id'])) - { - $this->ajaxReturn('请选择订单'); - } - - $m = M('Order'); - $where = ['id'=>intval($this->data_post['id']), 'user_id' => $this->user['id']]; - $data = $m->where($where)->field('id,status')->find(); - if(empty($data)) - { - $this->ajaxReturn(L('common_data_no_exist_error')); - } - if(!in_array($data['status'], [0,1])) - { - $status_text = L('common_order_user_status')[$data['status']]['name']; - $this->ajaxReturn('状态不可操作['.$status_text.']'); - } - - $save_data = ['status' => 5, 'cancel_time' => time(), 'upd_time' => time()]; - if($m->where($where)->save($save_data)) - { - $this->ajaxReturn(L('common_cancel_success'), 0); - } - $this->ajaxReturn(L('common_cancel_error')); + $params = $this->data_post; + $params['user_id'] = $this->user['id']; + $params['creator'] = $this->user['id']; + $params['creator_name'] = $this->user['user_name_view']; + $ret = OrderService::OrderCancel($params); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } /** - * [Collect 订单完成] + * [Collect 订单收货] * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -165,127 +147,31 @@ class OrderController extends CommonController */ public function Collect() { - if(empty($this->data_post['id'])) - { - $this->ajaxReturn('请选择订单'); - } - - $m = M('Order'); - $where = ['id'=>intval($this->data_post['id']), 'user_id' => $this->user['id']]; - $data = $m->where($where)->field('id,status')->find(); - if(empty($data)) - { - $this->ajaxReturn(L('common_data_no_exist_error')); - } - if(!in_array($data['status'], [3])) - { - $status_text = L('common_order_user_status')[$data['status']]['name']; - $this->ajaxReturn('状态不可操作['.$status_text.']'); - } - - $save_data = ['status' => 4, 'success_time' => time(), 'upd_time' => time()]; - if($m->where($where)->save($save_data)) - { - $this->ajaxReturn(L('common_confirm_success'), 0); - } - $this->ajaxReturn(L('common_confirm_error')); + $params = $this->data_post; + $params['user_id'] = $this->user['id']; + $params['creator'] = $this->user['id']; + $params['creator_name'] = $this->user['user_name_view']; + $ret = OrderService::OrderCollect($params); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } - // /** - // * [Pay 订单支付] - // * @author Devil - // * @blog http://gong.gg/ - // * @version 1.0.0 - // * @datetime 2018-07-22T22:10:46+0800 - // */ - // public function Pay() - // { - // if(empty($this->data_post['id'])) - // { - // $this->ajaxReturn('请选择订单'); - // } - - // $m = M('Order'); - // $where = ['id'=>intval($this->data_post['id']), 'user_id' => $this->user['id']]; - // $data = $m->where($where)->field('id,status,total_price')->find(); - // if(empty($data)) - // { - // $this->ajaxReturn(L('common_data_no_exist_error')); - // } - // if($data['total_price'] <= 0.00) - // { - // $this->ajaxReturn('金额不能为0'); - // } - // if($data['status'] != 1) - // { - // $status_text = L('common_order_user_status')[$data['status']]['name']; - // $this->ajaxReturn('状态不可操作['.$status_text.']'); - // } - - // // 发起支付 - // $notify_url = __MY_URL__.'Notify/order.php'; - // $pay_data = array( - // 'out_user' => md5($this->user['id']), - // 'order_sn' => $data['id'].GetNumberCode(6), - // 'name' => '订单支付', - // 'total_price' => $data['total_price'], - // 'notify_url' => $notify_url, - // ); - // $pay = (new \Library\Alipay())->SoonPay($pay_data, C("alipay_key_secret")); - // if(empty($pay)) - // { - // $this->ajaxReturn('支付接口异常'); - // } - // $this->ajaxReturn(L('common_operation_success'), 0, $pay); - // } - /** - * 确认 + * 订单删除 * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2018-06-18T00:10:32+0800 + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-30 + * @desc description */ - public function Confirm() + public function Delete() { - die('error'); - // 参数 - $params = [ - [ - 'checked_type' => 'empty', - 'key_name' => 'id', - 'error_msg' => '请选择订单', - ] - ]; - $ret = params_checked($this->data_post, $params); - if($ret !== true) - { - $this->ajaxReturn($ret); - } - - // 订单处理 - $m = M('Order'); - $where = ['id'=>intval($this->data_post['id']), 'user_id' => $this->user['id']]; - $data = $m->where($where)->field('id,status')->find(); - if(empty($data)) - { - $this->ajaxReturn(L('common_data_no_exist_error')); - } - - // 状态 - if($temp['status'] != 0) - { - $status_text = L('common_order_user_status')[$data['status']]['name']; - $this->ajaxReturn('状态不可操作['.$status_text.']'); - } - - // 开始处理 - $save_data = ['status' => 1, 'confirm_time' => time(), 'upd_time' => time()]; - if($m->where($where)->save($data)) - { - $this->ajaxReturn(L('common_confirm_success'), 0); - } - $this->ajaxReturn(L('common_confirm_error')); + $params = $this->data_post; + $params['user_id'] = $this->user['id']; + $params['creator'] = $this->user['id']; + $params['creator_name'] = $this->user['user_name_view']; + $params['user_type'] = 'user'; + $ret = OrderService::OrderDelete($params); + $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } } diff --git a/service/Application/Service/SearchService.class.php b/service/Application/Service/SearchService.class.php index 067ecbe6a..ac4851eb5 100755 --- a/service/Application/Service/SearchService.class.php +++ b/service/Application/Service/SearchService.class.php @@ -87,18 +87,20 @@ class SearchService if(!empty($params['screening_price_id'])) { $price = M('ScreeningPrice')->field('min_price,max_price')->where(['is_enable'=>1, 'id'=>intval($params['screening_price_id'])])->find(); - if(!empty($price['min_price']) && !empty($price['max_price'])) + $params['min_price'] = $price['min_price']; + $params['max_price'] = $price['max_price']; + if(!empty($params['min_price']) && !empty($params['max_price'])) { $where['g.price'] = [ - ['EGT', $price['min_price']], - ['LT', $price['max_price']], + ['EGT', $params['min_price']], + ['LT', $params['max_price']], ]; - } else if(!empty($price['min_price'])) + } else if(!empty($params['min_price'])) { - $where['g.price'] = ['EGT', $price['min_price']]; - } else if(!empty($price['max_price'])) + $where['g.price'] = ['EGT', $params['min_price']]; + } else if(!empty($params['max_price'])) { - $where['g.price'] = ['LT', $price['max_price']]; + $where['g.price'] = ['LT', $params['max_price']]; } }