From 7554a8a0732ace2f21613b35ec39c44e2aaeff4b Mon Sep 17 00:00:00 2001 From: Kiyan Date: Fri, 28 Apr 2017 16:06:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.json | 18 ++--- app/app.wxss | 5 ++ app/images/Shop-icon.png | Bin 0 -> 1608 bytes app/images/address_edit_white.png | Bin 0 -> 237 bytes app/images/address_list_selected.png | Bin 0 -> 551 bytes app/images/location.png | Bin 0 -> 1729 bytes app/pages/address/add.json | 4 +- app/pages/address/add.wxml | 41 ++++++++++- app/pages/address/list.js | 48 +++++++++++-- app/pages/address/list.json | 4 +- app/pages/address/list.wxml | 26 ++++++- app/pages/address/list.wxss | 3 +- app/pages/address/select.js | 49 ++++++++++++-- app/pages/address/select.json | 4 +- app/pages/address/select.wxml | 28 +++++++- app/pages/address/select.wxss | 55 ++++++++++++++- app/pages/index/index.wxml | 2 +- app/pages/index/index.wxss | 1 + app/pages/order/constant.js | 9 +++ app/pages/order/list.js | 97 +++++++++++++++++++++++++-- app/pages/order/list.wxml | 33 +++++++-- app/pages/order/list.wxss | 71 ++++++++++++++++++-- app/pages/order/quasi.js | 69 +++++++++++++++++-- app/pages/order/quasi.json | 4 +- app/pages/order/quasi.wxml | 82 +++++++++++++++++++++- app/pages/order/quasi.wxss | 92 ++++++++++++++++++++++++- app/pages/order/show.wxml | 2 +- 27 files changed, 689 insertions(+), 58 deletions(-) create mode 100644 app/images/Shop-icon.png create mode 100644 app/images/address_edit_white.png create mode 100644 app/images/address_list_selected.png create mode 100644 app/images/location.png create mode 100644 app/pages/order/constant.js diff --git a/app/app.json b/app/app.json index 4d42ab5..e354b0f 100644 --- a/app/app.json +++ b/app/app.json @@ -1,17 +1,17 @@ { "pages": [ - "pages/shop/show", - "pages/index/index", "pages/order/list", - "pages/mine/mine", - "pages/index/address", - "pages/order/show", - "pages/order/quasi", - "pages/shop/category", - "pages/shop/search", "pages/address/list", "pages/address/add", - "pages/address/select" + "pages/address/select", + "pages/index/index", + "pages/order/quasi", + "pages/shop/show", + "pages/mine/mine", + "pages/index/address", + "pages/shop/category", + "pages/shop/search", + "pages/order/show" ], "window": { "backgroundColor": "#f8f8f8", diff --git a/app/app.wxss b/app/app.wxss index 2fda36c..33c79ed 100644 --- a/app/app.wxss +++ b/app/app.wxss @@ -22,6 +22,10 @@ page { font-size: 0.8em; } +.trangle { + padding-right: 15px; +} + .trangle::after { content: ""; margin-top: -4px; @@ -59,6 +63,7 @@ button[type=primary], .weui-btn_primary { font-size: 13px; padding: 0 1.34em; border-radius: 0; + vertical-align: middle; } button[type="primary"][plain] { diff --git a/app/images/Shop-icon.png b/app/images/Shop-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2aae60d57ffdf3c5ae8668df0c2698dece0775bd GIT binary patch literal 1608 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|luOG6hER|_L2ClfUI2$*<4On9mVa^UGcH4m8Bi-4*6wOV5z0|V1uPZ!6K zid%1H#CG@wiX1<0D11pZRY_m&0*|SUCzr8Lhevr(bJB^7B{Mv-jxp=cd!ih#>booG zk*mf}tt>YEQ|#F_x!CAH$`V-_ z-NpM&A81PO@-?dl$s5VnoM1{8Dhg}nP1ye{^?7AlTw+z)ZL10Fy=(aMoqHT5pkGuqqS=38aA zYL};x=#iZ!XO=JpH?BMo@}OQIqT@tG?)%xg?pt-IC|}rP^IZ9#`Nn?T`~PDW-Fh~a z?RjL*zWWcn{Z`aH^ocv2{jjQEHE7jagLrf1xyLdaYikN be-;S_k69B~*L7M|fy#DIS3j3^P6|HGQk6<8P9)B(k6JY5_^EKWbYa*(eQ@8%{n6eR)1A{AOeSZnFoEG-70%4+=`iwjFTnkZHQW*b&=ug!RN7uDQmG zFYJH5Z|8)s34EFS&lDp0pCv@{Pim9r)s_`xKN-|B`Tg6<_18ad`^NUCm3iCd`-X}@ PcQAOm`njxgN@xNAgu7!t literal 0 HcmV?d00001 diff --git a/app/images/address_list_selected.png b/app/images/address_list_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..bf10ebd5ac7151226051cd51eac4a245e8ff19d6 GIT binary patch literal 551 zcmeAS@N?(olHy`uVBq!ia0vp^RzPgQ!3-p4uay=AQl$YtA+G;*y@3eGgD|j@>vsMB z_Wl3tl~CFL|3Qr2xgfHB;{RjkK#Zcc|5o8p1&QVVFW&;O?>q#NLD~PGzWnc=2x7l| z4fr3;2 zw=Z55$;ZIJXyxhR7~*mK=#}W;W&?q?#9v!OuQasDX?VS4JoW#7=dz_)oF~&Zn?Gwh z^X5$Pp1?L>ULd<(vDttaDlY)_G@coJmv4krkc*Ht!s45R{lOMN9X0T(q&%{PI7N>^mm(g z`{SDC`Oj{iuiPfSR)5+X#|!s&XPkfLqfJPIa1SlH{)G@C^or0l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij}d6sez@Lv8$1jldGYjtGSb#iJ^;;nT3U+ zg{6yysS!-COMY@`Zfaf$Om7N8uNzLipp=kX0JPa9wJ5VJHN~wcKUV?lW2;QuZgIwG z9#n4%ZnwDL)TVL91WY_2COp*wIq-C!ng>kmMZi>Tui5wwm|4s`T^vIy zZoQdVo6#F6bNu}t6SwH@qdLY)W@g>DH`-|ZQK8$Uuo$cw~Q%Ip6Ywg zvRB#qX;a!gUSs{UGmf5c>qy$UZ~4CMb+)$Wi{Ib1eZF(|*EzpR=G}fj=l=Ve^E=O5 z?tfkxK#YMP&tsL+MzH|)TU*_NpEsyoYq%Eh zKM(um16=F88nlD>?x_~BmUYamWorujqPcm^ zl}8oF1kOL;?{Lg{>H2@~qW?zgSwlJ>a6g*S;`MO(1#QNkN-w;4%^&&w%KGGWK$Oj9 zWg&a^g7d!1SbfAd&wqL;Pj(0IzQ())+e2Ar7o6{3#wwGzAerx5&V^@1Y&HzeGQaMn z%${+sBO<8NC*auYDCugc3XV?)syA>wX}FkR`{G&Tg%=P0%e>|~cBzi8&j0dF` zl3p{qSH?2C-TV^%=-h{23wrm?_!@g5MQiT86S0rln)gmD+dBKr<8_NC?akWg9oskI zZk}nSP`@CvWms4~MIY~;Gjm-wd1p6I$(^OXoaukX!e1A(d|o)mZuZ_2Zp}$< z$Fokk9hS_S8qRMLF8N_k+rf7AC+ZS!rZyyP)Q zB>WgFi_5!uvvcm3yIeRYXnt#x_`PjIeCeXN)h##mT+VcD^6#yfF5S6 z8Sm!GO}HM;q9IqDAj{{U(-oVv_1TM#)xi#I_qA4h5?T`VruxW(>94w02RA5*{}E6+ zbo+It;g6?Q$*(G`b9IFe2pe$xNm@16@3vFH+V%Ad1JCmY9|*Q{Uwv?Uqte}G^RKOL zQ^PjMpLwowHF(0eq(}Ns>YsdO{lQejcyaoFCLRVq)7Uewy8he-RVtpYelF{r5}E)G CL$#~` literal 0 HcmV?d00001 diff --git a/app/pages/address/add.json b/app/pages/address/add.json index 9e26dfe..51b918f 100644 --- a/app/pages/address/add.json +++ b/app/pages/address/add.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "navigationBarTitleText": "编辑收货地址" +} \ No newline at end of file diff --git a/app/pages/address/add.wxml b/app/pages/address/add.wxml index 928a1d4..5464296 100644 --- a/app/pages/address/add.wxml +++ b/app/pages/address/add.wxml @@ -1,2 +1,41 @@ + -pages/address/add.wxml + + + + 联系人 + + + + + + + + 手机号 + + + + + + + + 收货地址 + + + 松散 + + + + + 门牌号 + + + + + + + + + \ No newline at end of file diff --git a/app/pages/address/list.js b/app/pages/address/list.js index 6b2de16..751e00f 100644 --- a/app/pages/address/list.js +++ b/app/pages/address/list.js @@ -1,19 +1,55 @@ // pages/address/list.js Page({ - data:{}, - onLoad:function(options){ + data: { + list: [ + { + "addr_id": "170", + "user_id": "4", + "city_id": "330300", + "district_id": null, + "addr": "龙华大厦", + "detail": "", + "longitude": "120.69101", + "latitude": "28.002974", + "receiver": "test4", + "phone": "13000000005", + "create_time": "2017-02-20 10:38:11", + "delete": "0", + "district_name": "", + "city_name": "温州市" + }, + { + "addr_id": "160", + "user_id": "4", + "city_id": "330300", + "district_id": null, + "addr": "电商大厦", + "detail": "", + "longitude": "120.737561", + "latitude": "27.979617", + "receiver": "test4", + "phone": "13000000004", + "create_time": "2016-12-16 13:37:10", + "delete": "0", + "district_name": "", + "city_name": "温州市" + } + ] + + }, + onLoad: function (options) { // 页面初始化 options为页面跳转所带来的参数 }, - onReady:function(){ + onReady: function () { // 页面渲染完成 }, - onShow:function(){ + onShow: function () { // 页面显示 }, - onHide:function(){ + onHide: function () { // 页面隐藏 }, - onUnload:function(){ + onUnload: function () { // 页面关闭 } }) \ No newline at end of file diff --git a/app/pages/address/list.json b/app/pages/address/list.json index 9e26dfe..0c66b5b 100644 --- a/app/pages/address/list.json +++ b/app/pages/address/list.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "navigationBarTitleText": "我的地址" +} \ No newline at end of file diff --git a/app/pages/address/list.wxml b/app/pages/address/list.wxml index b41ec72..12db1ff 100644 --- a/app/pages/address/list.wxml +++ b/app/pages/address/list.wxml @@ -1,2 +1,26 @@ -pages/address/list.wxml + + + 我的地址 + + + + + {{item.receiver}} {{item.phone}} + + + {{item.addr}} + + + + + + + + + + + 新增地址 + diff --git a/app/pages/address/list.wxss b/app/pages/address/list.wxss index e935e1d..05c6e06 100644 --- a/app/pages/address/list.wxss +++ b/app/pages/address/list.wxss @@ -1 +1,2 @@ -/* pages/address/list.wxss */ \ No newline at end of file +/* pages/address/list.wxss */ +@import 'select.wxss'; \ No newline at end of file diff --git a/app/pages/address/select.js b/app/pages/address/select.js index a1f18fa..3fd69a7 100644 --- a/app/pages/address/select.js +++ b/app/pages/address/select.js @@ -1,19 +1,56 @@ // pages/address/select.js Page({ - data:{}, - onLoad:function(options){ + data: { + selectedId: 170, + list: [ + { + "addr_id": "170", + "user_id": "4", + "city_id": "330300", + "district_id": null, + "addr": "龙华大厦", + "detail": "", + "longitude": "120.69101", + "latitude": "28.002974", + "receiver": "test4", + "phone": "13000000005", + "create_time": "2017-02-20 10:38:11", + "delete": "0", + "district_name": "", + "city_name": "温州市" + }, + { + "addr_id": "160", + "user_id": "4", + "city_id": "330300", + "district_id": null, + "addr": "电商大厦", + "detail": "", + "longitude": "120.737561", + "latitude": "27.979617", + "receiver": "test4", + "phone": "13000000004", + "create_time": "2016-12-16 13:37:10", + "delete": "0", + "district_name": "", + "city_name": "温州市" + } + ] + + }, + onLoad: function (options) { // 页面初始化 options为页面跳转所带来的参数 }, - onReady:function(){ + onReady: function () { // 页面渲染完成 }, - onShow:function(){ + onShow: function () { // 页面显示 }, - onHide:function(){ + onHide: function () { // 页面隐藏 }, - onUnload:function(){ + onUnload: function () { // 页面关闭 } }) \ No newline at end of file diff --git a/app/pages/address/select.json b/app/pages/address/select.json index 9e26dfe..fc0d67f 100644 --- a/app/pages/address/select.json +++ b/app/pages/address/select.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "navigationBarTitleText": "收货地址" +} \ No newline at end of file diff --git a/app/pages/address/select.wxml b/app/pages/address/select.wxml index 72ccd9e..e47d48f 100644 --- a/app/pages/address/select.wxml +++ b/app/pages/address/select.wxml @@ -1,2 +1,28 @@ + -pages/address/select.wxml + + + 可选收货地址 + + + + + + {{item.receiver}} {{item.phone}} + + + {{item.addr}} + + + + + + + + + + + 新增地址 + \ No newline at end of file diff --git a/app/pages/address/select.wxss b/app/pages/address/select.wxss index e80ce5a..82e6c4e 100644 --- a/app/pages/address/select.wxss +++ b/app/pages/address/select.wxss @@ -1 +1,54 @@ -/* pages/address/select.wxss */ \ No newline at end of file +/* pages/address/select.wxss */ +page { + padding-bottom: 50px; +} + +.address-select__hd { + padding: 5px 15px; + font-size: 14px; + color: #999; + border-bottom: 1rpx solid #e8e8e8; +} + +.address__list { + background-color: #fff; +} + +.address__item { + position: relative; + padding: 10px 15px; + border-bottom: 1rpx solid #e8e8e8; +} + +.address__item-selected-img { + position: absolute; + top: 0; + left: 0; + width: 29px; + height: 28px; +} + +.address__item-edit { + position: absolute; + right: 15px; + top: 50%; + padding: 5px 10px; + transform: translateY(-50%); +} + +.address__item-edit-img { + width: 20px; + height: 20px; +} + +.address-add-btn { + position: fixed; + bottom: 0; + left: 0; + right: 0; + height: 50px; + line-height: 50px; + text-align: center; + color: #fff; + background-color: #ff5801; +} \ No newline at end of file diff --git a/app/pages/index/index.wxml b/app/pages/index/index.wxml index f7cf058..67cdf13 100644 --- a/app/pages/index/index.wxml +++ b/app/pages/index/index.wxml @@ -3,7 +3,7 @@ - + 电商大厦电商大厦(兴区路) diff --git a/app/pages/index/index.wxss b/app/pages/index/index.wxss index 03132b4..744c6cd 100644 --- a/app/pages/index/index.wxss +++ b/app/pages/index/index.wxss @@ -24,6 +24,7 @@ } .address__icon { + margin-top: -2px; width: 24px; height: 24px; vertical-align: middle; diff --git a/app/pages/order/constant.js b/app/pages/order/constant.js new file mode 100644 index 0000000..4a851a4 --- /dev/null +++ b/app/pages/order/constant.js @@ -0,0 +1,9 @@ +export const ORDER_STATES = { + "1": '订单待支付', + "2": '等待商家接单', + "3": '订单进行中', + "4": '订单已完成', + "5": '订单已取消', + "6": '退款中', + "7": '已退款' +} \ No newline at end of file diff --git a/app/pages/order/list.js b/app/pages/order/list.js index 1c524cb..1fafc72 100644 --- a/app/pages/order/list.js +++ b/app/pages/order/list.js @@ -1,19 +1,104 @@ // pages/order/list.js +import { ORDER_STATES } from './constant' + Page({ - data:{}, - onLoad:function(options){ + data: { + login: true, + ORDER_STATES, + list: [ + { + "order_id": "1370", + "order_no": "2017042815510158201158862546", + "seller_id": "2", + "seller_name": "鲜极道", + "title": "鸡腿饭(大)", + "add_time": "1493365861", + "order_price": "42.98", + "pay_price": "34.98", + "state": "1", + "is_reviews": "0", + "pic_url": "http://mtest.ipaotui.com/Uploadfile/Img/seller_goods/1461034075146103407535640.jpg" + }, + { + "order_id": "1347", + "order_no": "2017040708540884666377388205", + "seller_id": "2", + "seller_name": "鲜极道", + "title": "鸡翅饭", + "add_time": "1491526448", + "order_price": "36.00", + "pay_price": "28.00", + "state": "4", + "is_reviews": "0", + "pic_url": "http://mtest.ipaotui.com/" + }, + { + "order_id": "1345", + "order_no": "2017033115480943749489684006", + "seller_id": "2", + "seller_name": "鲜极道", + "title": "香肠饭 等2件商品", + "add_time": "1490946489", + "order_price": "48.00", + "pay_price": "39.00", + "state": "5", + "is_reviews": "0", + "pic_url": "http://mtest.ipaotui.com/" + }, + { + "order_id": "1344", + "order_no": "2017033016225869845172165968", + "seller_id": "2", + "seller_name": "鲜极道", + "title": "鸡翅饭", + "add_time": "1490862178", + "order_price": "36.00", + "pay_price": "26.00", + "state": "5", + "is_reviews": "0", + "pic_url": "http://mtest.ipaotui.com/" + }, + { + "order_id": "1343", + "order_no": "2017033016045232046206634491", + "seller_id": "2", + "seller_name": "鲜极道", + "title": "鸡翅饭", + "add_time": "1490861092", + "order_price": "36.00", + "pay_price": "25.00", + "state": "5", + "is_reviews": "0", + "pic_url": "http://mtest.ipaotui.com/" + }, + { + "order_id": "1342", + "order_no": "2017033014434386598425245711", + "seller_id": "2", + "seller_name": "鲜极道", + "title": "鸡腿饭", + "add_time": "1490856223", + "order_price": "40.98", + "pay_price": "30.98", + "state": "5", + "is_reviews": "0", + "pic_url": "http://mtest.ipaotui.com/Uploadfile/Img/seller_goods/1461034075146103407535640.jpg" + }, + ] + }, + onLoad: function (options) { // 页面初始化 options为页面跳转所带来的参数 }, - onReady:function(){ + onReady: function () { // 页面渲染完成 }, - onShow:function(){ + onShow: function () { // 页面显示 }, - onHide:function(){ + onHide: function () { // 页面隐藏 }, - onUnload:function(){ + onUnload: function () { // 页面关闭 } }) \ No newline at end of file diff --git a/app/pages/order/list.wxml b/app/pages/order/list.wxml index 21236fd..349b619 100644 --- a/app/pages/order/list.wxml +++ b/app/pages/order/list.wxml @@ -1,10 +1,31 @@ - - - - - 您还没有登录, 登录后查看订单 + + + + + + {{item.seller_name}} + + {{ORDER_STATES[item.state]}} - 登录 + + + + ¥{{item.pay_price}} + {{item.add_time}} + + + + + 去评论 + + + + + + + 您还没有登录, 登录后查看订单 + + 登录 \ No newline at end of file diff --git a/app/pages/order/list.wxss b/app/pages/order/list.wxss index 0d41785..5f8b14e 100644 --- a/app/pages/order/list.wxss +++ b/app/pages/order/list.wxss @@ -1,15 +1,74 @@ /* pages/order/list.wxss */ .order-logout { - text-align: center; + text-align: center; } .order-logout__bg { - margin-top: 100px; - width: 176px; - height: 126px; + margin-top: 100px; + width: 176px; + height: 126px; } .order-logout__tip { - margin-top: 10px; -} \ No newline at end of file + margin-top: 10px; +} + +/* order-list */ + +.order-item { + margin-top: 10px; + background-color: #fff; + border-top: 1rpx solid #e8e8e8; + border-bottom: 1rpx solid #e8e8e8; +} + +.order-item__hd { + margin-left: 15px; + padding: 5px 15px 5px 0; + border-bottom: 1rpx solid #e8e8e8; + overflow: hidden; +} + +.order-item__shop { + position: relative; + float: left; + color: #000; +} + +.order-item__status { + float: right; + color: #999; + font-size: 14px; +} +.order-item__status_pay { + color: #ff5801; +} + +.order-item__bd { + display: flex; + padding: 10px 15px; +} + +.order-item__ft { + margin-left: 15px; + padding: 5px 15px 5px 0; + text-align: right; + border-top: 1rpx solid #e8e8e8; +} + +.order-item__content { + position: relative; + flex: 1; +} + +.order-item__pic { + margin-right: 10px; + height: 60px; + width: 60px; +} + +.order-item__price { + font-size: 1.2em; + color: #ff5801; +} diff --git a/app/pages/order/quasi.js b/app/pages/order/quasi.js index e782ec2..bb925fe 100644 --- a/app/pages/order/quasi.js +++ b/app/pages/order/quasi.js @@ -1,19 +1,76 @@ // pages/order/quasi.js Page({ - data:{}, - onLoad:function(options){ + data: { + info: { + "quasi_order_id": "2691", + "order_no": "2017042716455369061206686592", + "seller_id": "2", + "user_id": "4", + "state": "0", + "add_time": "1493282753", + "order_price": "42.98", + "pay_price": "34.98", + "goods_price": "22.98", + "cut_money": "8.00", + "coupon_money": "0.00", + "packing_fee": "2.00", + "delivery_fee": "18.00", + "receiver": "test4", + "receiver_addr": "龙华大厦", + "receiver_gps": "120.69101,28.002974", + "receiver_phone": "13000000005", + "receive_time": null, + "distance": "7.177", + "remark": null, + "is_reviews": "0", + "is_delete": "0", + "delivery_order_id": "0", + "title": "鸡腿饭(大)", + "receiver_city": "330300", + "commision": "0.00", + "user_coupon_id": null, + "coupon_type": null, + "real_delivery_fee": "18.00", + "cut_delivery_fee": "0.00", + "service_money": "0.00", + "seller_name": "鲜极道", + "seller_phone": "88888888", + "goods": [ + { + "goods_id": "29", + "sub_id": "50", + "seller_id": "2", + "detail": "鸡腿饭 xx", + "sales": "46", + "praise": "0", + "state": "1", + "commision": "3.00", + "goods_name": "鸡腿饭(大)", + "price": "22.98", + "packing_fee": "2.00", + "stock": "74", + "is_delete": "0", + "pic_url": "http://test.storesystem.cn/Uploadfile/Img/seller_goods/1461034075146103407535640.jpg", + "num": "1", + "price_sum": "22.98" + } + ] + + }, + }, + onLoad: function (options) { // 页面初始化 options为页面跳转所带来的参数 }, - onReady:function(){ + onReady: function () { // 页面渲染完成 }, - onShow:function(){ + onShow: function () { // 页面显示 }, - onHide:function(){ + onHide: function () { // 页面隐藏 }, - onUnload:function(){ + onUnload: function () { // 页面关闭 } }) \ No newline at end of file diff --git a/app/pages/order/quasi.json b/app/pages/order/quasi.json index 9e26dfe..8d07d3b 100644 --- a/app/pages/order/quasi.json +++ b/app/pages/order/quasi.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "navigationBarTitleText": "提交订单" +} \ No newline at end of file diff --git a/app/pages/order/quasi.wxml b/app/pages/order/quasi.wxml index ef4723f..31f1560 100644 --- a/app/pages/order/quasi.wxml +++ b/app/pages/order/quasi.wxml @@ -1,2 +1,82 @@ + -pages/order/quasi.wxml + + + + + {{info.receiver}} {{info.receiver_phone}} + + {{info.receiver_addr}} + + + + + + + 支付方式 + 在线支付 + + + 红包 + ¥{{info.coupon_money}} + + + 红包 + 暂无可用 + + + + + + {{info.seller_name}} + + + + + {{item.goods_name}} + x{{item.num}} + ¥{{item.price_sum}} + + + + + 餐盒费 + + ¥{{info.packing_fee}} + + + 配送费 + + ¥{{info.delivery_fee}} + + + + + 商城优惠 + + -¥{{info.cut_money}} + + + + + + 总计¥{{info.order_price}} 优惠¥{{info.cut_money}} + + + 实付 + ¥{{info.pay_price}} + + + + + + + + 已优惠¥{{info.cut_money}} + + 待支付 ¥{{info.pay_price}} + + + \ No newline at end of file diff --git a/app/pages/order/quasi.wxss b/app/pages/order/quasi.wxss index 80c1ecd..2e68e15 100644 --- a/app/pages/order/quasi.wxss +++ b/app/pages/order/quasi.wxss @@ -1 +1,91 @@ -/* pages/order/quasi.wxss */ \ No newline at end of file +/* pages/order/quasi.wxss */ + +.quasi { + padding-bottom: 50px; +} + +.weui-media-box_address::after { + right: 15px; +} + +/* quasi-goods */ + +.quasi-goods { + margin-top: 10px; + background-color: #fff; + border-top: 1rpx solid #e8e8e8; + border-bottom: 1rpx solid #e8e8e8; +} + +.quasi-goods__hd { + margin-left: 10px; + padding: 10px 10px 10px 0; + color: #999; + border-bottom: 1rpx solid #e8e8e8; +} + +.quasi-goods__img { + margin-top: -2px; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.quasi-goods__list { + margin-left: 10px; +} + +.quasi-goods__list:not(:last-child) { + border-bottom: 1rpx solid #e8e8e8; +} + +.quasi-goods__item { + display: flex; + padding: 10px 10px 10px 0; +} + +.quasi-goods__item-name { + flex: 2; +} + +.quasi-goods__item-name_grey { + color: #999; +} + +.quasi-goods__item-num { + flex: 1; + color: #999; +} + + +/* quasi-action*/ +.quasi-actions { + position: fixed; + bottom: 0; + left: 0; + right: 0; + display: flex; + height: 50px; + padding-left: 10px; + background-color: #fff; + align-items: center; +} +.quasi-actions__cut { + flex: 1; +} + +.quasi-actions__pay { + margin-right: 10px; +} +.menu-cart__btn[type=primary] { + margin: 0; + height: 50px; + min-width: 100px; + font-size: 16px; + line-height: 50px; + border: none; + border-radius: 0; +} +.menu-cart__btn::after { + content: none; +} \ No newline at end of file diff --git a/app/pages/order/show.wxml b/app/pages/order/show.wxml index 85ab97b..5a1f259 100644 --- a/app/pages/order/show.wxml +++ b/app/pages/order/show.wxml @@ -1,4 +1,4 @@ - + test