From 87ac2d39f6589605a826f438d9f23959ff8ced7d Mon Sep 17 00:00:00 2001 From: wangkesi Date: Wed, 17 Oct 2018 17:32:59 +0800 Subject: [PATCH] v 2.4.1 --- package.json | 1 + src/api/order.js | 26 ++ src/assets/images/order-list/address.png | Bin 0 -> 1251 bytes src/assets/images/order-list/coupon.png | Bin 0 -> 1879 bytes src/assets/images/order-list/edit.png | Bin 0 -> 1359 bytes src/assets/images/order-list/true.png | Bin 0 -> 1500 bytes src/assets/images/order-list/wechat.png | Bin 0 -> 4304 bytes src/assets/styles/style.css | 385 +++++++++++------------ src/components/back-header.vue | 7 +- src/components/order-item.vue | 110 ++++++- src/main.js | 92 ++++-- src/models/home-model.js | 37 +-- src/models/order-model.js | 41 +++ src/models/utils-model.js | 135 ++++---- src/models/wxShare.js | 153 +++++---- src/router/index.js | 2 +- src/view/home.vue | 4 +- src/view/month-card.vue | 10 +- src/view/order-check.vue | 304 ++++++++++++++++-- src/view/order-detail.vue | 308 ++++++++++++++++-- src/view/order-list.vue | 62 +++- 21 files changed, 1202 insertions(+), 475 deletions(-) create mode 100644 src/api/order.js create mode 100644 src/assets/images/order-list/address.png create mode 100644 src/assets/images/order-list/coupon.png create mode 100644 src/assets/images/order-list/edit.png create mode 100644 src/assets/images/order-list/true.png create mode 100644 src/assets/images/order-list/wechat.png create mode 100644 src/models/order-model.js diff --git a/package.json b/package.json index c1189ce..299e8f3 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "opn": "^4.0.2", "optimize-css-assets-webpack-plugin": "^1.3.2", "ora": "^1.3.0", + "qs": "^6.5.2", "rimraf": "^2.6.2", "sass-loader": "^6.0.6", "semver": "^5.4.1", diff --git a/src/api/order.js b/src/api/order.js new file mode 100644 index 0000000..d52925f --- /dev/null +++ b/src/api/order.js @@ -0,0 +1,26 @@ +export default { + getList: { + url: "/mall/web/order/list", + method: "get" + }, + getDetail: { + url: "/mall/web/order/detail", + method: "get" + }, + checkOrder: { + url: "/mall/web/order/prepare", + method: "post" + }, + cancel: { + url: "/mall/web/order/cancel", + method: "put" + }, + addOrder: { + url: "/mall/web/order/new", + method: "post" + }, + payMoney: { + url: "/mall/web/order/pay", + method: "put" + } +}; diff --git a/src/assets/images/order-list/address.png b/src/assets/images/order-list/address.png new file mode 100644 index 0000000000000000000000000000000000000000..91cc93436d5ead14033ebf87a696f84e58a99728 GIT binary patch literal 1251 zcmV<91RVQ`P)mlM%scBiIH^)lFE}b)7jf>85O!WbfV0YOa`hyUh9f=A1Kg z&bfq|rIc#ZTHgiWVIsN%zzzUZOV@&L4d6Qf6I$z+CK% z+czrQD?c-TL`27=l;^zitVOp9j8bZ^*7{Q-x_%=wR}ajB5Mm%2jeg#&@OpfyRBC4^6ncf3 z@2k+gmCxsoBoc{yv-;Kr!^{iDn1Ogaz6HkZbhkX?azYJA2c2EZJbQoi6j zFw9K3T<#Vj#35!5xdGBzf78>`bEdz)|1aNxaWmfQzLzjdr_Y zw;2(AWsG^qah&swfLZIHvf1na5v2gwFt_VNDdnN2!FcqBE18$utX4=Slj##eybfS* zW$$At<-Pw&FsW4P_Fyo0rlnv;M@P4Hb#+CG#iHw=qphv2G&D3+s6FLoJkxS86B83V zB9X{bMATR3rm41lPHX*aJRbjIqdC)ZFiNTGwAQmk5ZrPJwMLWmoPsP3c5%p3>=E=Hr#AAOlKu6M3S0$+sLimghi z!0ha-Ynav6WGno>0Aq{5a=Cmz5#1_;5N?iO=AQs$9LKrfyPU~pvsVN7l8CxI4%Cax z{Dk8;&-o6_)YR0zP$*)Lcz|~AJ?J0?aj+5!Lo N002ovPDHLkV1iiTVo3l1 literal 0 HcmV?d00001 diff --git a/src/assets/images/order-list/coupon.png b/src/assets/images/order-list/coupon.png new file mode 100644 index 0000000000000000000000000000000000000000..680e05075a1f7b28104189c30d57604072fca27e GIT binary patch literal 1879 zcmV-d2dMaoP)2V56aq0Vgpb6S*ruel(WbzbvhVH8++)sq-)1{IyEC&) z*RJVJ_K$t<-E+?Go^#LropXl(AeYO%8$hr85z%`9kUXC!g8>{QqJCq{Z++kYCkY@T zx(mRU05r}MAmz*~0(c^y&-aqndJBMCN&vkLU}PQuYz43&v6GpLM06{KVfY#|pJ!hj zBchuYE?l_1qoX4_*+B(C(BwGISDE=|MAT;OJt&?s$sS_n&A#v7da{ElwNGpPT>!tb z&sjjpMw2lXMNwNiogSTUpoWKsoufyOz5$?FY@ZD3Ezk2LM(5?wT1yTXxBnEVli7u* zJXNiC1_uY1E2S<~O5NwW?*3}$g<&WR=88h0@MKq4*YnlRE0Y21yQj3)7c%obMD!6N zdeCv4Z?9Ul>di_9hGBR*Gv5K=D**Nq(dDk|zF28qx%YJsKdtqr0E7U}0w8qd0nhWU zoXNOMCZm=wUoL#@N+N0i@U~K_v$L~vxE`Ry2nAr2h}s((8uqSUy*jQ{u-5tt0JmFU z5Dyq*e$ds`CFjR+BM5>s9LM<~fQ|OW>qNBKb=}|Bs#jP=b93|gM6?^g=>UwR^t}K+ z0Eiv@H>K2rmhB#_Re{#JmzjS|L`wi118`duMSbaX`mID(e}BKTc=6)R0B!)V2*43$ z-s=1QFKX2n1i{&k<7@!17QlsaL^1O|Vd>(2Ss^E37R>zDIF3{4bo$@5D6*?|9T8;! zv@o-|9K+EQkp)yss(25J96a6)^+RF)xn4aNA}rmNw@>p*4o;- zsiUK#P_+U8*=+W`5>Ws?Vdsr9^Roc@;yC`}L@_uxIM}9?>LDUA=xo{W%zRfI$D1aH zPc_Q7ZQFL*(xppp2CxahLI6jJ=n()bnfXlFzd}HxDB6-vr^l+1nS3J|(-`w30M`=H zX#frZ_$d+H0LZ?O@R71)Z7P*|t`^1e?XF$B7Q}HZVR$V7 zQ7*(;V%`wZ_9%)rr_DfJf%>S^EilTe&iUl0T>V`F2occzR*ixy4nosp4|vcQ{~n)1~Ys9NjC zCE-)ZR!j2nL z6v(-?Y}vAYBKn%0c;n>5vm7{PmP7nJA{sBJrzj!%d-9B#KUD6ULZOiF?(W`CL`i$0 z>^cf-k@L;Ie6+Q-)h}%lO#wADG_;~vEZ#>%LY)o}(OTDaFJrV2RN76Z(v|xL0enfPXK(&_9_oB^OiV{cO>VYfRfPp7=R5#^hLV@^1N!A zWWC#`lq%b}Vdje`R*~q1a-J~8$hmd1@B0-?k5ZaMM8}LV&nl(*q;!#H=0(gb6y_YO zOiGcL3x&d^-QC^)nr$pio>$LAk;t_S{b2wXCEaCaev^oL#7mD5(HCs#@ehetW6Up8 zsnl!r03M0?YQg%eeV)4`YeE!vH&WlXY${hfOIqCbINKnb**1bnj$!l6`VbDTqi=OA5kn5uV1t=lM=L6X9 zdEWObEy8Tx&pD{!;o-)8`}Q@Cjg1x8uV0^^jnS3n%sHq^2G!&JDNyxT#kr6%ou~e< zF5M=sN2N*PdET$*VrA>8BMif9nE6gCbNqVr0DyDl0W-g$l-hLo@Zo!FZ7$Z+$ZBQT zi|jAki)`r%%Qz&UwgQkw=0wNGwv20TUsY>N9lw*dwe%H}A-&4mh0vZWbrUnMw6_m+ z)H$c3q`LUCQtImQdTPgx9q(&wY+Nth93ome-+so!%!iax_Y=`?)~s2x_dg(bfHpsh R*qi_W002ovPDHLkV1kUtuSfs@ literal 0 HcmV?d00001 diff --git a/src/assets/images/order-list/edit.png b/src/assets/images/order-list/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..df1aeff2956a07c0a2be7fad349078330a5b1223 GIT binary patch literal 1359 zcmV-V1+e;wP)ARzR*P(HvO6QGf*2nx)KU@Z$Aj31`thLF)tJULc4v;;og~*+id;j*OiWDNYZ%79V2Wi=EAUD7crHh zRSG!~*$co9=3GWZHVh69>WAz3Qd2RtK&yx#rqk)0Nq!9Arl9_`hz!}beWWg8YKhkT zKihGfJ^*h4xHb4aCnCEtnauN}qoe=UMNF;H(oUw+>6IjtBC?940+1v50)Uq-%hF4r z3rf|PH3}^eIZJXc$)}46IX9Q0tV#>-Z6sPGU(IH-J4Z%FGGRVfC8ib7s(Q|}5?WP> zX*IN}64PpERV1cW(TXglmC=eUrj^kuTTDBkRhF1`L8~k=?SfWGG3|y{sF-#{D^yH7 zqE%FkK0L_fawh>S&u@ZAzLw2qw~dU9{8z#1dch8{oMn6k{Vd!zr&6i)N~weMj0u3R z0X#Z5ICwN-CoHx@EN2-Xv7h3bvvfMWo#c)JV_MKj5m{&3_K9*kin>EA*Y0BXo!`$m zjh^tqN04ioZ&RN%E_$w2?LWU*duoJy-`6h{JQ75# zeTHG|$>nml0q7;UN<_LyE)|iu{tiYkZ@c7?>0%DlvYrzY6U&rR?~~Lo7?fQ^#3y+M zz`G>3gdLfdZLkJ6a(sOJO4BrTp5vAh_VhzD3*g86M?_8;hH=94yeZqZXKLU})h2l8 z(4iHkX?{cU(t-*78-TA!9uK~MFilhE>}NgCo3$)Uiz~IXsoJ@y2J{2(Dw3{<=)~zU z0DAp()UvE!q8e-V{pUinj#!CA!f&=S)%MS1GTG75(a}fpvTBVrqrFl}eBYnWWHQGz zW(ViLJkSh>YSE|f`}_5>{SN?_*TP_vZJc5%m3o}y*1~AkWXGa*|F_O{{tq#hgKx!> Rn^6D&002ovPDHLkV1g&{g>C=< literal 0 HcmV?d00001 diff --git a/src/assets/images/order-list/true.png b/src/assets/images/order-list/true.png new file mode 100644 index 0000000000000000000000000000000000000000..f9791f68b48575ae531d3d27da1b4311d3df952f GIT binary patch literal 1500 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
- +
@@ -13,6 +13,11 @@ export default { type: String, default: "" } + }, + methods: { + back() { + location.href = this.path; + } } }; diff --git a/src/components/order-item.vue b/src/components/order-item.vue index 12d9bc4..5b62d4b 100644 --- a/src/components/order-item.vue +++ b/src/components/order-item.vue @@ -1,37 +1,103 @@ diff --git a/src/view/order-detail.vue b/src/view/order-detail.vue index 4e35027..ea5345f 100644 --- a/src/view/order-detail.vue +++ b/src/view/order-detail.vue @@ -1,100 +1,333 @@ @@ -120,6 +353,15 @@ export default { padding: 0 0.36rem 0 0.3rem; line-height: 1; align-items: center; + img { + width: 0.34rem; + height: 0.28rem; + margin-right: 0.2rem; + } + .item-top-left { + display: flex; + align-items: center; + } .item-top-address { } .item-top-state { @@ -271,7 +513,7 @@ export default { } .time-box { width: 100%; - height: 1.5rem; + // height: 1.5rem; padding: 0.4rem 0.2rem; background-color: #fff; box-sizing: border-box; @@ -365,7 +607,7 @@ export default { justify-content: center; align-items: center; border: 0.01rem solid rgba(220, 220, 220, 1); - border-radius:4px; + border-radius: 4px; } .button { } @@ -380,6 +622,9 @@ export default { } } } + .right { + justify-content: flex-end; + } } .fill { width: 100%; @@ -396,6 +641,9 @@ export default { line-height: 1rem; color: #00ba85; font-size: 0.36rem; + a { + color: #00ba85; + } } .green { background: #00ba86; diff --git a/src/view/order-list.vue b/src/view/order-list.vue index be60db2..a03815c 100644 --- a/src/view/order-list.vue +++ b/src/view/order-list.vue @@ -1,30 +1,76 @@