From c1d3a7303852dd3a80bdfeae24767b002452cc1a Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Sun, 25 Nov 2018 23:54:55 +0800 Subject: [PATCH] order --- alipay/app.js | 2 +- alipay/app.json | 4 +- alipay/images/user-index-nav-order-icon-1.png | Bin 0 -> 1628 bytes alipay/images/user-index-nav-order-icon-2.png | Bin 0 -> 2090 bytes alipay/images/user-index-nav-order-icon-3.png | Bin 0 -> 4099 bytes alipay/images/user-index-nav-order-icon-4.png | Bin 0 -> 2885 bytes alipay/images/user-nav-booking-order-icon.png | Bin 5443 -> 0 bytes alipay/images/user-nav-order-icon.png | Bin 0 -> 2633 bytes alipay/pages/user-order/user-order.js | 19 +++++-- alipay/pages/user/user.acss | 23 +++++++- alipay/pages/user/user.axml | 25 +++++++-- alipay/pages/user/user.js | 49 +++++++++++------- alipay/pages/user/user.json | 5 +- .../Api/Controller/OrderController.class.php | 11 ---- .../Api/Controller/UserController.class.php | 6 +++ .../Service/OrderService.class.php | 14 ++--- 16 files changed, 109 insertions(+), 49 deletions(-) create mode 100644 alipay/images/user-index-nav-order-icon-1.png create mode 100644 alipay/images/user-index-nav-order-icon-2.png create mode 100644 alipay/images/user-index-nav-order-icon-3.png create mode 100644 alipay/images/user-index-nav-order-icon-4.png delete mode 100755 alipay/images/user-nav-booking-order-icon.png create mode 100644 alipay/images/user-nav-order-icon.png diff --git a/alipay/app.js b/alipay/app.js index 63e19ff24..96d26b5fa 100755 --- a/alipay/app.js +++ b/alipay/app.js @@ -47,7 +47,7 @@ App({ // 请求地址 request_url: "https://demo.shopxo.net/", - //request_url: 'http://localhost/project/shopxo/service/', + request_url: 'http://localhost/project/shopxo/service/', // 基础信息 application_title: "ShopXO电商系统", diff --git a/alipay/app.json b/alipay/app.json index c851a018e..e64e758f1 100755 --- a/alipay/app.json +++ b/alipay/app.json @@ -1,9 +1,9 @@ { - "pages": [ + "pages": ["pages/user/user", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", - "pages/user/user", + "pages/web-view/web-view", "pages/login/login", "pages/paytips/paytips", diff --git a/alipay/images/user-index-nav-order-icon-1.png b/alipay/images/user-index-nav-order-icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..b17897383b6a0fecbe9b1142e561253155b95229 GIT binary patch literal 1628 zcmcJPeK6Ds7{{Mot(WAMvFL=f-d`_qxLR87CswWPyuZY$^kSDyA?tmKvED98o4vK% znkC9h*85AvHLhe)s}x4kAtg~;vuR7Go4LRGr+@B`=XK^Y&v)i|=E>df<*u?(dm{j- zkUS9Y^~n5Uit_9Jrt`r;0C@uv;^NB)TjElV>-g#1O246$TU_Z|q=%UKD?0^7@lj5i zxN~|&p7~m@D;3N#rldlbh~zuNo8tH;E^0li*dB%{?wxh;VKqX_3pbpVVxC<_#Jov{ z?_uGj^sn*MfGF1 zd&;U1txp~`VJ-L^EteYEy}7oW&^^^GvTR7zMlDEXu@Z^Ifwi#h;nRthvmDtJU7AT7 z*#ly`)LhQ=NvpbSnZ4UAYwUx`#mCX`K8rKbfqO6(ia!-bOC6|6H-I4aCnAFF{M9c>F^3^JAivB&2#dvVNrNtr8rlzSgV^3`Hlw z1<)7R6ON-m&lMYK1d6pP*kEAh-2FLN30$c+&uGGvZEuVG(afTWl|L}wgs=nQeHmxj zxYC`qP?V#yrP~`}jlXwzy(b-y7kvx}VmojW>rL|l{Qdpu+Spgx+b?gHVqGs=_PtD3 zFU3J}?38>a%bHrhtBoTElLBK$2P>fOjhJuT#Tzy|YE2fRm}Y#l9_MH{ZJ1tL61;uD z0bO)td@B;y_#EFuuV5O0DXF;M>yqRiujG4_$7tLc&a$vQhvb890R74ztL_hUL6nU| zRI?X}kc~dmQ0t`cD17*tOhml4OZrF=e~R357cy)Tro26MYm|w7q5&4A?AN-+#@*w~ z(!#BF#s_f;1(fx@(nKjKhGYW=x;msMcB6nl=`v*GSo&K^XZV z|F*4xeXciknwuakduT8I zyX16L`@xft-n302@2vFiCmh_@mAR&=>T{Q$gaW?(-yT{JgNv)70kLMtQH=Q-mxrv0 z0)tTK{pBvd;Vb0j!X05$HY==AU((_IB6%_q!nq}vIxPnu>sKnbE#_A`PAtBoKN|jW z6NDiYQ2KI&nvf;VGSP)zpA~)`2KaU}Bn4Q(rI^xCL{lz!aw^;9p9gMShG z5lQTkpzFu49HY};&6$5r-h4x;g={bW2~;DS+S-5_?R{<-#q`K;ZN)&;`MkLA012+E zw^~=@D~JVs@uBEw)Vc&bPY%v$(rC)?$XMgK4zOARLqed}zSiRz5C#1c6KH57x$RT{ zyw%v4CR`<(|2Lvqh3J9|gxTOvk!hbg>ODkclZ^iUeol6F_KDnuM=X^pZ|b}kcihlo zP`EpHq1+~RcmD18QC&tVRY}LV@}`K;a4W>KR<0E`Z;}rvHcX^aHDg}esR#Oa^6D^O zcHPw48t;b`Q1T;p_DwxdH_dyx8rCR1Xa#Lpto)h1q~ad`P_!3g-xG_f`(~qQiwW`U zBUkW3!rHCENR6E?Moi$2OW58}6&N4hyG1KzSV z&j|J#)hixD5woiNn>N5@fyRs_u&&-WX9Mv<3%(2kYV6>C@pOIY^~nu_V!8Ey4J0=& Jq`@^j^B?hv&4B;_ literal 0 HcmV?d00001 diff --git a/alipay/images/user-index-nav-order-icon-2.png b/alipay/images/user-index-nav-order-icon-2.png new file mode 100644 index 0000000000000000000000000000000000000000..fb20b68666029f003a3d174115be25484406fad4 GIT binary patch literal 2090 zcmcgu`#;nBAAfJy)=(S9P?}M>U$XXKZnN|0UU)bhC7bCs%7l(gWOFGWCy|ikGC9X_ z2qAo%^le|4ZgR_4ld(t{sue5OI=(ySA2`2#e|SA#ugBx{c)cFa$K&;Qy`HZOU+>-8 zSR*U|Kzr{V$WP@3e;Ed)!VZtnZUE48dm%4>9_wQXANCK>d)!x8czx{39~KrlPbx^3 z)r1%P-!|V^_W2%)GdA+ySGJX_pehwL))YVKQfY@`VL!ehGtD9e*`P;oDi3+F;c}2w zxp|J(TD|9J*EyMMG?!|_k!2Ugy&f%0kUdn&MDoNwPVa+H4^|aB$2-C_`lqK|cx<4R zEAs=z=5-!5Lh1_KCv}cgLFR05dbQz!TdIjq#f^MsUJA zEChLEH`F(!T+VK9(KizKRZ(8YjxFNneyM-7-1e40B5wetI*iQpaCbeBHECm7J_Zlt zA6W~Oifo<@x;qgqqWM6VPIK)2uQj)~dK(eI^2&nDI?f&6H zUo37Q$+YuYE5btmvhu~umx5bCleta)Vr82w(SzS~{p`O9;^<;Bc-x$rS%R$qc)~^8 z`}Z2-Bw$k=>xeI*cgk^d_kCrZiPz-ui)Ke3X7h!=`&Hd?F8b*jZftnaZ8L;O`SFJ%Hr~|=>CA+ehw!TtN^theiK2RXF{nLq0VCbb}@U zTDYHT&W1jf+ja-Z(FnCN7Z8)-0+y_%g&&lwZVylN5C`W!q=hDrDI4*2wJF%)fhVpUZa@RQ}4KL&g_z8Yb#1))Ji!DG^fE zFK`SLayGtM+3t1#nq;x?b8f_%NuAl%RNRy{z=;d<{v3}?*u<2fzS^J3Y!Mu_D zr@E2Z6`5xzZuw{o*gMD`M)NrogxHIGUQ}7hi37&)F!Irlzg3&wOI>&g|Thr9cC2T=2M zb=cg(4Mo~>i^z}LD0c+ICIfFR0dGtGKJL?#cOO?Xj~tFaO#p5H80>8L6fa9%PW-dh zLPCkD8~9gp3)i0B*~h?I^hsa5dbNC#&tH4xAj#WTVa=2=Ql@SA9zI>^f zn3%{7{qQ(CYXJC{KHr2C+&=|d3TL_x*0Qulyaw$Jp)}Q*VRQyS=5bct{;one!W1f( zelXl1p6V&G-&&5uyJx{;`JLYmKu26@v~yZoTE$tDLh7+!8&g;ILBVQ3PCZ60-%h?B zBN{yq$mc{0J#3*u5h+@^INE8t>G%!4k4kuG8L(My zZtjuPKbM_k7g6k~6qWi&lx-)VruvtDmQT|oBQ8S_pY$dh=1o5@blQCBVB#1cTE`Zl zOhm}0s`Za9bpc}03LnV<|EQ3C1OdV!7}3!o$BF^5PB1aCrp=qBVH}I=^;JIr*t^pk Js$;NI{s+y-n&SWf literal 0 HcmV?d00001 diff --git a/alipay/images/user-index-nav-order-icon-3.png b/alipay/images/user-index-nav-order-icon-3.png new file mode 100644 index 0000000000000000000000000000000000000000..61483e02c4b01f86df034e665c32d980d1249293 GIT binary patch literal 4099 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 literal 0 HcmV?d00001 diff --git a/alipay/images/user-index-nav-order-icon-4.png b/alipay/images/user-index-nav-order-icon-4.png new file mode 100644 index 0000000000000000000000000000000000000000..db15f17c0dfd004a9842f92292aae843ee5635fd GIT binary patch literal 2885 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 Vl-&VmE5#fIhF8o`Wk|=z{{s;_CU^h< diff --git a/alipay/images/user-nav-order-icon.png b/alipay/images/user-nav-order-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c0380d099af68450928363f648ae9ce596e530f2 GIT binary patch literal 2633 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 VTC(SMtzi2BFgLNnmKnLn{s%Hg#LEBx literal 0 HcmV?d00001 diff --git a/alipay/pages/user-order/user-order.js b/alipay/pages/user-order/user-order.js index 4037a4c00..3133524f8 100755 --- a/alipay/pages/user-order/user-order.js +++ b/alipay/pages/user-order/user-order.js @@ -16,7 +16,7 @@ Page({ temp_pay_index: 0, nav_status_list: [ { name: "全部", value: "-1" }, - { name: "待付款", value: "0,1" }, + { name: "待付款", value: "1" }, { name: "待发货", value: "2" }, { name: "待收货", value: "3" }, { name: "已完成", value: "4" }, @@ -26,7 +26,21 @@ Page({ }, onLoad(params) { - this.setData({params: params}); + // 是否指定状态 + var nav_status_index = 0; + if ((params.status || null) != null) { + for (var i in this.data.nav_status_list) { + if (this.data.nav_status_list[i]['value'] == params.status) { + nav_status_index = i; + break; + } + } + } + + this.setData({ + params: params, + nav_status_index: nav_status_index, + }); this.init(); }, @@ -122,7 +136,6 @@ Page({ data_page: this.data.data_page + 1, load_status: 1, payment_list: res.data.data.payment_list || [], - nav_status_list: res.data.data.nav_status_list || [], }); // 是否还有数据 diff --git a/alipay/pages/user/user.acss b/alipay/pages/user/user.acss index 228ba097e..7051ddc29 100755 --- a/alipay/pages/user/user.acss +++ b/alipay/pages/user/user.acss @@ -3,7 +3,7 @@ padding: 30rpx 10rpx; font-size: 24rpx; } -.head-item .portrait{ +.head-item .avatar { width: 160rpx; height: 160rpx; border-radius: 50%; @@ -27,6 +27,7 @@ } .nav-box .nav-item .item-icon{ width: 40rpx; + height: 40rpx; vertical-align: middle; } .nav-box .nav-item .item-name{ @@ -35,4 +36,24 @@ .nav-box .nav-item .item-arrow{ width: 25rpx; } + +.items-list { + padding: 15rpx 0; +} +.items-list .items { + width: 25%; + position: relative; +} +.items-list .items .items-icon { + width: 60rpx; + height: 60rpx; + margin-bottom: 6rpx; +} +.items-list .items .am-badge { + position: absolute; + top: 0; + left: calc(50% + 30rpx); +} + + .user-notice { margin-top: 20rpx; padding: 0 10rpx 20rpx 10rpx; } \ No newline at end of file diff --git a/alipay/pages/user/user.axml b/alipay/pages/user/user.axml index 9fea06b53..bfaa5fa0c 100755 --- a/alipay/pages/user/user.axml +++ b/alipay/pages/user/user.axml @@ -1,17 +1,32 @@ - + {{nickname}} - + + + - - {{item.name}} + + {{item.name}} - + + + + + + + + + {{items.name}} + + + + + diff --git a/alipay/pages/user/user.js b/alipay/pages/user/user.js index 96794f7e4..430264cbc 100755 --- a/alipay/pages/user/user.js +++ b/alipay/pages/user/user.js @@ -8,20 +8,25 @@ Page({ agreement_url: '', customer_service_tel: null, common_user_center_notice: null, - + user_order_status_list: [ + { name: "待付款", status: 1, count: 0 }, + { name: "待发货", status: 2, count: 0 }, + { name: "待收货", status: 3, count: 0 }, + { name: "已完成", status: 4, count: 0 }, + ], lists: [ + { + url: "user-order", + icon: "user-nav-order-icon", + is_show: 1, + name: "我的订单", + }, { url: "user-address", icon: "user-nav-address-icon", is_show: 1, name: "我的地址" }, - { - url: "user-order", - icon: "user-nav-booking-order-icon", - is_show: 1, - name: "我的订单" - }, { url: "user-faovr", icon: "user-nav-faovr-icon", @@ -83,22 +88,28 @@ Page({ my.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; + + // 订单数量处理 + var temp_user_order_status_list = this.data.user_order_status_list; + if ((data.user_order_status || null) != null && data.user_order_status.length > 0) { + for (var i in temp_user_order_status_list) { + for (var t in data.user_order_status) { + if (temp_user_order_status_list[i]['status'] == data.user_order_status[t]['status']) { + temp_user_order_status_list[i]['count'] = data.user_order_status[t]['count']; + break; + } + } + } + } + this.setData({ + user_order_status_list: temp_user_order_status_list, customer_service_tel: data.customer_service_tel || null, common_user_center_notice: data.common_user_center_notice || null, + avatar: (data.avatar != null) ? data.avatar : this.data.avatar, + nickname: (data.nickname != null) ? data.nickname : this.data.nickname, + integral: (data.integral != null) ? data.integral : this.data.integral, }); - if(data.avatar != null) - { - this.setData({avatar: data.avatar}); - } - if(data.nickname != null) - { - this.setData({nickname: data.nickname}); - } - if(data.integral != null) - { - this.setData({integral: data.integral}); - } } else { my.showToast({ type: "fail", diff --git a/alipay/pages/user/user.json b/alipay/pages/user/user.json index c96031fd7..40f099847 100755 --- a/alipay/pages/user/user.json +++ b/alipay/pages/user/user.json @@ -1,3 +1,6 @@ { - "pullRefresh": true + "pullRefresh": true, + "usingComponents": { + "badge": "mini-antui/es/badge/index" + } } \ No newline at end of file diff --git a/service/Application/Api/Controller/OrderController.class.php b/service/Application/Api/Controller/OrderController.class.php index a61b26bd6..1d5c184e1 100755 --- a/service/Application/Api/Controller/OrderController.class.php +++ b/service/Application/Api/Controller/OrderController.class.php @@ -68,23 +68,12 @@ class OrderController extends CommonController // 支付方式 $payment_list = ResourcesService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]); - // 导航状态列表 - $nav_status_list = [ - ['name'=>'全部', 'value'=>'-1'], - ['name'=>'待付款', 'value'=>'0,1'], - ['name'=>'待发货', 'value'=>'2'], - ['name'=>'待收货', 'value'=>'3'], - ['name'=>'已完成', 'value'=>'4'], - ['name'=>'已失效', 'value'=>'5,6'], - ]; - // 返回数据 $result = [ 'total' => $total, 'page_total' => $page_total, 'data' => $data['data'], 'payment_list' => $payment_list, - 'nav_status_list' => $nav_status_list, ]; $this->ajaxReturn(L('common_operation_success'), 0, $result); } diff --git a/service/Application/Api/Controller/UserController.class.php b/service/Application/Api/Controller/UserController.class.php index efd5970df..41b800bb2 100755 --- a/service/Application/Api/Controller/UserController.class.php +++ b/service/Application/Api/Controller/UserController.class.php @@ -2,6 +2,8 @@ namespace Api\Controller; +use Service\OrderService; + /** * 用户 * @author Devil @@ -235,6 +237,9 @@ class UserController extends CommonController // 登录校验 $this->Is_Login(); + // 用户订单状态 + $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); + // 初始化数据 $result = array( 'integral' => $this->user['integral'], @@ -243,6 +248,7 @@ class UserController extends CommonController 'username' => $this->user['username'], 'customer_service_tel' => MyC('common_customer_service_tel'), 'common_user_center_notice' => MyC('common_user_center_notice'), + 'user_order_status' => $user_order_status['data'], ); // 返回数据 diff --git a/service/Application/Service/OrderService.class.php b/service/Application/Service/OrderService.class.php index 43993bee9..da242bd69 100755 --- a/service/Application/Service/OrderService.class.php +++ b/service/Application/Service/OrderService.class.php @@ -1245,7 +1245,7 @@ class OrderService $order_status_list = L('common_order_user_status'); foreach(L('common_order_user_status') as $v) { - $result[$v['id']] = [ + $result[] = [ 'name' => $v['name'], 'status' => $v['id'], 'count' => 0, @@ -1255,15 +1255,17 @@ class OrderService // 数据处理 if(!empty($data)) { - - foreach($data as $v) + foreach($result as &$v) { - if(isset($result[$v['status']])) + foreach($data as $vs) { - $result[$v['status']]['count'] = $v['count']; + if($v['status'] == $vs['status']) + { + $v['count'] = $vs['count']; + continue; + } } } - sort($result); } // 待评价状态站位100