fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by lea guo
Commit 4baf6514e110f42b82891bd2f5893b9e647a8141 1 parent 1677f174

订单列表&升级vue

Inline Side-by-side
Showing 7 changed files with 210 additions and 63 deletions
<template>
<div class="order-item-wrapper">
<div class="item-img">
<img
alt=""
src="//img10.static.yhbimg.com/goodsimg/2019/06/17/16/01c74e27eab148e4731af0e53518878972.jpg?imageMogr2/thumbnail/235x314/position/center/quality/60/format/webp"
/>
</div>
<div class="item-info">
<div class="price-status">
<span class="price">¥299.00</span>
<slot name="orderStatus" :orderStatus="orderStatus"></slot>
</div>
<p class="item-name">
Nike Air Max 97 秋季限定款Kobe签名独家发售 限购
</p>
<p class="item-spec">
蓝色，39码
</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
orderStatus: "交易成功"
};
}
};
</script>
<style lang="scss" scoped>
.order-item-wrapper {
display: flex;
.item-img {
max-width: 180px;
max-height: 180px;
& > img {
width: 100%;
height: 100%;
}
}
.item-name {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}
.item-info {
display: flex;
justify-content: space-between;
align-items: center;
}
}
</style>
\ No newline at end of file
... ...
<template>
<scroll class="order-list-wrapper"> </scroll>
</template>
<script>
import { Scroll } from "cube-ui";
export default {
components: {
Scroll
}
};
</script>
<style lang="scss" scoped>
.order-list-wrapper {
height: 100vh;
}
</style>
\ No newline at end of file
... ...
const routers = [
// 买家订单
// owner: {sell, buy} 订单来源
{
name: 'BuyerOrderList',
path: '/xianyu/buyer/order/list',
component: () => import('./order-list.vue'),
path: '/xianyu/order/list/:owner',
component: () => import('./order-list'),
},
];
... ...
... ... @@ -9,6 +9,5 @@ export default {
}
};
</script>
<style lang="sass" scoped>
<style lang="scss" scoped>
</style>
\ No newline at end of file
... ...
/**
* param 仅为参数校验使用
*/
module.exports = {
'/api/ufo/invite/friendList': {
ufo: true,
... ... @@ -42,4 +45,25 @@ module.exports = {
tabType: { type: Number, require: true }, // 订单来源
},
},
// 订单详情
'/order/detail': {
ufo: true,
api: 'ufo.order.detail',
params: {
tabType: { type: Number, require: true }, // 订单来源
order_code: { type: Number, require: true }, // 订单编号
uid: { type: String, require: true },
},
},
// 确认收货
'/buyer/confirm/receipt': {
ufo: true,
api: 'ufo.buyer.confirm',
params: {
order_code: { type: Number, require: true }, // 订单编号
uid: { type: String, require: true },
},
},
};
... ...
... ... @@ -59,15 +59,15 @@
"serve-favicon": "^2.5.0",
"source-map": "^0.7.3",
"uuid": "^3.3.2",
"vue": "^2.5.20",
"vue": "^2.6.10",
"vue-awesome-swiper": "^3.1.3",
"vue-infinite-scroll": "^2.0.2",
"vue-lazyload": "^1.2.6",
"vue-loader": "^15.4.2",
"vue-loader": "^15.7.1",
"vue-router": "^3.0.2",
"vue-server-renderer": "^2.5.20",
"vue-server-renderer": "^2.6.10",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.5.20",
"vue-template-compiler": "^2.6.10",
"vue-touch": "^1.1.0",
"vue-virtual-scroll-list": "^1.2.8",
"vuex": "^3.0.1",
... ...
... ... @@ -982,19 +982,20 @@
resolved "http://r.cnpmjs.org/@types/yargs/download/@types/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
integrity sha1-Rd0dBjjoyPFT6H0paQdlkpaHORY=
"@vue/component-compiler-utils@^2.0.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.3.0.tgz#4f580f1b28fc7685859d87ea0e92a1c0271c93da"
"@vue/component-compiler-utils@^3.0.0":
version "3.0.0"
resolved "https://registry.npm.taobao.org/@vue/component-compiler-utils/download/@vue/component-compiler-utils-3.0.0.tgz#d16fa26b836c06df5baaeb45f3d80afc47e35634"
integrity sha1-0W+ia4NsBt9bqutF89gK/EfjVjQ=
dependencies:
consolidate "^0.15.1"
hash-sum "^1.0.2"
lru-cache "^4.1.2"
merge-source-map "^1.1.0"
postcss "^6.0.20"
postcss-selector-parser "^3.1.1"
prettier "1.13.7"
source-map "^0.5.6"
vue-template-es2015-compiler "^1.6.0"
postcss "^7.0.14"
postcss-selector-parser "^5.0.0"
prettier "1.16.3"
source-map "~0.6.1"
vue-template-es2015-compiler "^1.9.0"
"@webassemblyjs/ast@1.5.13":
version "1.5.13"
... ... @@ -1694,7 +1695,12 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
bluebird@^3.1.1:
version "3.5.5"
resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
integrity sha1-qNCv1zJR7/u9X+OEp31zADwXpx8=
bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
version "3.5.3"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
... ... @@ -2437,7 +2443,8 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
consolidate@^0.15.1:
version "0.15.1"
resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
resolved "https://registry.npm.taobao.org/consolidate/download/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
integrity sha1-IasEMjXHGgfUXZqtmFk7DbpWurc=
dependencies:
bluebird "^3.1.1"
... ... @@ -2727,7 +2734,8 @@ date-now@^0.1.4:
de-indent@^1.0.2:
version "1.0.2"
resolved "http://npm.yohops.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
resolved "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
debug@*, debug@4.1.0, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0:
version "4.1.0"
... ... @@ -5574,9 +5582,10 @@ lodash._baseclone@~4.5.0:
version "4.5.7"
resolved "http://npm.yohops.com/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz#ce42ade08384ef5d62fa77c30f61a46e686f8434"
lodash._reinterpolate@~3.0.0:
lodash._reinterpolate@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
resolved "https://registry.npm.taobao.org/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
lodash.assign@^4.2.0:
version "4.2.0"
... ... @@ -5626,21 +5635,24 @@ lodash.tail@^4.1.1:
resolved "http://npm.yohops.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
lodash.template@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
version "4.5.0"
resolved "https://registry.npm.taobao.org/lodash.template/download/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
integrity sha1-+XYZXPPzR9DV9SSDVp/oAxzM6Ks=
dependencies:
lodash._reinterpolate "~3.0.0"
lodash._reinterpolate "^3.0.0"
lodash.templatesettings "^4.0.0"
lodash.templatesettings@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
version "4.2.0"
resolved "https://registry.npm.taobao.org/lodash.templatesettings/download/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
integrity sha1-5IExDwSdPPbUfpEq0JMTsVTw+zM=
dependencies:
lodash._reinterpolate "~3.0.0"
lodash._reinterpolate "^3.0.0"
lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
version "4.17.11"
... ... @@ -5865,7 +5877,8 @@ merge-descriptors@1.0.1:
merge-source-map@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
resolved "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
integrity sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=
dependencies:
source-map "^0.6.1"
... ... @@ -7030,7 +7043,7 @@ postcss-scss@^2.0.0:
dependencies:
postcss "^7.0.0"
postcss-selector-parser@^3.1.0, postcss-selector-parser@^3.1.1:
postcss-selector-parser@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
dependencies:
... ... @@ -7038,6 +7051,15 @@ postcss-selector-parser@^3.1.0, postcss-selector-parser@^3.1.1:
indexes-of "^1.0.1"
uniq "^1.0.1"
postcss-selector-parser@^5.0.0:
version "5.0.0"
resolved "https://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
integrity sha1-JJBENWaXsztk8aj3yAki3d7nGVw=
dependencies:
cssesc "^2.0.0"
indexes-of "^1.0.1"
uniq "^1.0.1"
postcss-selector-parser@^5.0.0-rc.4:
version "5.0.0-rc.4"
resolved "http://npm.yohops.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0-rc.4.tgz#ca5e77238bf152966378c13e91ad6d611568ea87"
... ... @@ -7067,14 +7089,6 @@ postcss@^5.2.10:
source-map "^0.5.6"
supports-color "^3.2.3"
postcss@^6.0.20:
version "6.0.23"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
dependencies:
chalk "^2.4.1"
source-map "^0.6.1"
supports-color "^5.4.0"
postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.6"
resolved "http://npm.yohops.com/postcss/-/postcss-7.0.6.tgz#6dcaa1e999cdd4a255dcd7d4d9547f4ca010cdc2"
... ... @@ -7083,6 +7097,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5,
source-map "^0.6.1"
supports-color "^5.5.0"
postcss@^7.0.14:
version "7.0.18"
resolved "https://registry.npm.taobao.org/postcss/download/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
integrity sha1-S5zala5sBpxnpNkzAp7d1IOKwjM=
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
supports-color "^6.1.0"
prelude-ls@~1.1.2:
version "1.1.2"
resolved "http://npm.yohops.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
... ... @@ -7091,9 +7114,10 @@ prepend-http@^1.0.1:
version "1.0.4"
resolved "http://npm.yohops.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
prettier@1.13.7:
version "1.13.7"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
prettier@1.16.3:
version "1.16.3"
resolved "https://registry.npm.taobao.org/prettier/download/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
integrity sha1-jGIWhFO63vcC80tFtu6JlXSmpl0=
pretty-error@^2.0.2:
version "2.1.1"
... ... @@ -7745,7 +7769,14 @@ resolve@^1.1.7:
dependencies:
path-parse "^1.0.6"
resolve@^1.2.0, resolve@^1.3.2:
resolve@^1.2.0:
version "1.12.0"
resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
integrity sha1-P8ZEo1yEpIVUYJ/ybsUrZvpXffY=
dependencies:
path-parse "^1.0.6"
resolve@^1.3.2:
version "1.8.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
dependencies:
... ... @@ -7955,7 +7986,12 @@ send@0.16.2:
range-parser "~1.2.0"
statuses "~1.4.0"
serialize-javascript@^1.3.0, serialize-javascript@^1.4.0:
serialize-javascript@^1.3.0:
version "1.9.1"
resolved "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-1.9.1.tgz?cache=0&sync_timestamp=1567600455468&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
integrity sha1-z8IArvd7YAxH2pu4FJyUPnmML9s=
serialize-javascript@^1.4.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
... ... @@ -8185,7 +8221,8 @@ source-map@0.1.x:
source-map@0.5.6:
version "0.5.6"
resolved "http://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
source-map@^0.4.2:
version "0.4.4"
... ... @@ -8584,7 +8621,7 @@ supports-color@^3.2.3:
dependencies:
has-flag "^1.0.0"
supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
dependencies:
... ... @@ -9258,8 +9295,9 @@ vue-eslint-parser@^4.0.2:
lodash "^4.17.11"
vue-hot-reload-api@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
version "2.3.4"
resolved "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
integrity sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=
vue-infinite-scroll@^2.0.2:
version "2.0.2"
... ... @@ -9269,11 +9307,12 @@ vue-lazyload@^1.2.6:
version "1.2.6"
resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.6.tgz#baa04c172d52a812608eb12c7a6bfb14f5c91079"
vue-loader@^15.4.2:
version "15.4.2"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.4.2.tgz#812bb26e447dd3b84c485eb634190d914ce125e2"
vue-loader@^15.7.1:
version "15.7.1"
resolved "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.7.1.tgz?cache=0&sync_timestamp=1563435501637&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.7.1.tgz#6ccacd4122aa80f69baaac08ff295a62e3aefcfd"
integrity sha1-bMrNQSKqgPabqqwI/ylaYuOu/P0=
dependencies:
"@vue/component-compiler-utils" "^2.0.0"
"@vue/component-compiler-utils" "^3.0.0"
hash-sum "^1.0.2"
loader-utils "^1.1.0"
vue-hot-reload-api "^2.3.0"
... ... @@ -9283,9 +9322,10 @@ vue-router@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"
vue-server-renderer@^2.5.20:
version "2.5.20"
resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.20.tgz#b4d4718949592f7138d7fa2b370f2a00b967af37"
vue-server-renderer@^2.6.10:
version "2.6.10"
resolved "https://registry.npm.taobao.org/vue-server-renderer/download/vue-server-renderer-2.6.10.tgz#cb2558842ead360ae2ec1f3719b75564a805b375"
integrity sha1-yyVYhC6tNgri7B83GbdVZKgFs3U=
dependencies:
chalk "^1.1.3"
hash-sum "^1.0.2"
... ... @@ -9303,16 +9343,18 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
vue-template-compiler@^2.5.20:
version "2.5.20"
resolved "http://npm.yohops.com/vue-template-compiler/-/vue-template-compiler-2.5.20.tgz#b9c01741b7e0261d1c5aac5937c93bde98f880f0"
vue-template-compiler@^2.6.10:
version "2.6.10"
resolved "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc"
integrity sha1-MjtPNJXwT6o1AzN6gvXWUHeZycw=
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
vue-template-es2015-compiler@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
vue-template-es2015-compiler@^1.9.0:
version "1.9.1"
resolved "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=
vue-touch@^1.1.0:
version "1.1.0"
... ... @@ -9324,9 +9366,10 @@ vue-virtual-scroll-list@^1.2.8:
version "1.2.8"
resolved "http://npm.yohops.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.2.8.tgz#893fba84a982bc06c9c7a2c7f71e4d437c2e82f4"
vue@^2.5.20:
version "2.5.20"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.20.tgz#79fff9ccaa10cc37e7a7239b4c7adfac94df81ba"
vue@^2.6.10:
version "2.6.10"
resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
integrity sha1-pysaQqTYKnIepDjRtr9V5mGVxjc=
vuex@^3.0.1:
version "3.0.1"
... ...