From c347578befafe891cf82aa72d83afc7c1e2a5bef Mon Sep 17 00:00:00 2001 From: ch Date: Thu, 7 Apr 2022 19:18:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/goods.js | 24 +- common/utils/requset.js | 8 +- components/BsChoiceGoods.vue | 58 + components/BsEmpty.vue | 2 +- .../{BsGoodsGroup.vue => UiGoodsGroup.vue} | 94 +- components/UiPageHeader.vue | 8 +- components/goods-sku-popup/index.vue | 1364 ----------------- .../goods-sku-popup/number-box/index.vue | 450 ------ pages.json | 7 - pages/account/cart.vue | 6 +- pages/account/index.vue | 4 +- pages/goods/category.vue | 108 +- pages/goods/components/Comment.vue | 162 -- pages/goods/components/Service.vue | 157 -- pages/goods/components/SkuPopup.vue | 179 --- pages/goods/components/SlideImage.vue | 141 -- pages/goods/detail.scss | 230 --- pages/goods/detail.vue | 304 ---- pages/goods/list/components/Sort.vue | 63 +- pages/goods/list/index.vue | 110 +- pages/goods/search.vue | 9 +- pages/index/components/Banner.vue | 6 +- pages/index/components/Sekill.vue | 28 +- pages/index/index.vue | 29 +- pages/login.vue | 17 +- static/index/banner.jpg | Bin 0 -> 171718 bytes 26 files changed, 388 insertions(+), 3180 deletions(-) create mode 100644 components/BsChoiceGoods.vue rename components/{BsGoodsGroup.vue => UiGoodsGroup.vue} (68%) delete mode 100644 components/goods-sku-popup/index.vue delete mode 100644 components/goods-sku-popup/number-box/index.vue delete mode 100644 pages/goods/components/Comment.vue delete mode 100644 pages/goods/components/Service.vue delete mode 100644 pages/goods/components/SkuPopup.vue delete mode 100644 pages/goods/components/SlideImage.vue delete mode 100644 pages/goods/detail.scss delete mode 100644 pages/goods/detail.vue create mode 100644 static/index/banner.jpg diff --git a/common/api/goods.js b/common/api/goods.js index e8cb67d..f6ef37d 100644 --- a/common/api/goods.js +++ b/common/api/goods.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-04-02 09:54:53 * @LastEditors: ch - * @LastEditTime: 2022-04-06 10:15:32 + * @LastEditTime: 2022-04-07 15:06:26 * @Description: file content */ import {ToAsyncAwait, MsbRequest} from '@/common/utils'; @@ -25,4 +25,24 @@ export const ApiGetGoodsDetail = (params) => * @param {*} productId */ export const ApiGetGoodsSkus = (params) => -ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/product/sku`,params)); \ No newline at end of file +ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/product/sku`,params)); + +/** + * 获取首页分类导航 + */ +export const ApiGetCategoryNav = () => +ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/product/categoryNavigation`)); + + +/** + * 获取一级分类列表 + */ +export const ApiGetCategoryOneList = () => +ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/productCategory/levelOne`)); + + +/** + * 获取二级分类和商品列表 + */ +export const ApiGetCategoryTwoAndGoods = (params) => +ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/productCategory/listCategoryAndProduct/${params.categoryId}`)); \ No newline at end of file diff --git a/common/utils/requset.js b/common/utils/requset.js index ecfa279..a23e69e 100644 --- a/common/utils/requset.js +++ b/common/utils/requset.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-17 17:42:32 * @LastEditors: ch - * @LastEditTime: 2022-04-07 10:26:32 + * @LastEditTime: 2022-04-07 16:10:37 * @Description: 项目接口请求统一处理器,返回一个需要token和不需要token的请求封装方法 */ @@ -53,8 +53,10 @@ MsbRequestTk.baseUrl = BASE_URL[ENV]; MsbRequestTk.use('request', (option) => { const token = $store.state.token if(!token){ - uni.redirectTo({url:'/login'}); - return Promise.reject({message:'请您先登录'}); + const pages = getCurrentPages(); + const page = pages[pages.length - 1]; + page.$Router.replace({path : '/login',query:{h : page.__page__.path}}) + return Promise.reject({message:'要先登录才能操作哦~'}); }else{ option.header = {...option.header, Authorization:$store.state.token} return option; diff --git a/components/BsChoiceGoods.vue b/components/BsChoiceGoods.vue new file mode 100644 index 0000000..bff5b34 --- /dev/null +++ b/components/BsChoiceGoods.vue @@ -0,0 +1,58 @@ + + + + \ No newline at end of file diff --git a/components/BsEmpty.vue b/components/BsEmpty.vue index aad4189..527a7d0 100644 --- a/components/BsEmpty.vue +++ b/components/BsEmpty.vue @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-20 13:11:55 * @LastEditors: ch - * @LastEditTime: 2022-03-29 15:04:36 + * @LastEditTime: 2022-04-07 15:34:03 * @Description: file content -->