From 178fdb4b4605147aed08c3506dd1e4380caaf1a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Thu, 6 Jan 2022 16:53:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/order.js | 4 +- apis/interfaces/store.js | 27 ++++++++ apis/interfaces/user.js | 19 ++++++ pages.json | 2 +- pages/auth/auth.vue | 8 +-- pages/store/goods.vue | 74 ++++++++------------- pages/store/index.vue | 139 +++++++++------------------------------ pages/user/index.vue | 32 +++++---- router/index.js | 6 +- static/user/cover.png | Bin 0 -> 1313 bytes 10 files changed, 132 insertions(+), 179 deletions(-) create mode 100644 apis/interfaces/store.js create mode 100644 apis/interfaces/user.js create mode 100644 static/user/cover.png diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js index 69cbda1..aae3318 100644 --- a/apis/interfaces/order.js +++ b/apis/interfaces/order.js @@ -5,9 +5,7 @@ * moduleName: 订单 */ -import { - request -} from '../index' +import { request } from '../index' export { diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js new file mode 100644 index 0000000..7a071cf --- /dev/null +++ b/apis/interfaces/store.js @@ -0,0 +1,27 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 商城 + */ + +import { request } from '../index' + +// 商城 +const mall = () =>{ + return request({ + url: 'mall' + }) +} + +// 商品详情 +const goods = (id) => { + return request({ + url: 'mall/goods/' + id + }) +} + +export { + mall, + goods +} diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js new file mode 100644 index 0000000..da02903 --- /dev/null +++ b/apis/interfaces/user.js @@ -0,0 +1,19 @@ +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + * moduleName: 用户 + */ + +import { request } from '../index' + +// 用户 +const info = () =>{ + return request({ + url: 'user/info' + }) +} + +export { + info +} diff --git a/pages.json b/pages.json index 3e5cc54..f629a0e 100644 --- a/pages.json +++ b/pages.json @@ -75,7 +75,7 @@ "style": { "navigationBarTitleText": "确认订单", "enablePullDownRefresh": false - } + } }, { "path": "pages/order/index", "name": "Order", diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue index db57790..7103e21 100644 --- a/pages/auth/auth.vue +++ b/pages/auth/auth.vue @@ -5,7 +5,7 @@ - 一键登录 + 一键登录 @@ -52,11 +52,7 @@ code : this.code }).then(res => { this.$store.commit('setToken', res.token_type + ' ' + res.access_token) - if(this.$Route.toName){ - this.$Router.back() - }else{ - this.$Router.replaceAll({name: 'Index'}) - } + this.$Router.back() }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/store/goods.vue b/pages/store/goods.vue index c6ebab4..d0638d9 100644 --- a/pages/store/goods.vue +++ b/pages/store/goods.vue @@ -3,64 +3,31 @@ - + - - - - - - - - - - - + - {{current}}/3 + {{current}}/{{goods.pictures.length}} - 学生奶 3.8g乳蛋白娟姗纯牛奶 250ml*10盒 - 1%英国珍稀牛种,优级口感与营养 + {{goods.name}} + {{goods.description}} - ¥59.9 + ¥{{goods.price.show}} - 销量2w+ + 销量{{goods.sales}} - 详情 - - - - - - - - - - - - - - - - - - - - - + @@ -71,17 +38,34 @@ @@ -236,11 +155,13 @@ font-weight: bold; color: $text-color; line-height: 40rpx; + @extend .nowrap; } .card-subtitle{ font-size: 20rpx; color: $text-gray; line-height: 40rpx; + @extend .nowrap; } .card-cover{ width: 80rpx; diff --git a/pages/user/index.vue b/pages/user/index.vue index e38ba44..d7863f3 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -1,17 +1,13 @@