diff --git a/library-activity/README.md b/library-activity/README.md index 2d277da..ac641cc 100644 --- a/library-activity/README.md +++ b/library-activity/README.md @@ -5,16 +5,26 @@ ## 目录结构介绍 ## - +```bash |-- dist // 项目打包后生产目录 |-- public // 静态文件目录,可直接在index.html 中引入 |-- src // 源码目录 | |-- components // 公共组件 - | |-- leftnav.vue // 左边菜单栏 - | |-- navcon.vue // 头部菜单栏 - | |-- Pagination.vue // 公共分页组件 + | |-- tabBar.vue // 底部菜单栏 | |-- views // 主要路由页面 - | |-- Login.vue // 登录 + | |-- aboutUs.vue // 关于我们 + | |-- activeDetail.vue // 活动详情 + | |-- bookList.vue // 开始选书列表 + | |-- cart.vue // 书车 + | |-- result.vue // 下单成功页 + | |-- feedback.vue // 反馈与建议 + | |-- logisticsInfo.vue // 物流详情 + | |-- mine.vue // 我的 + | |-- myAddress.vue // 我的地址 + | |-- addAddress.vue // 添加地址 + | |-- myLending.vue // 我的借阅 + | |-- order.vue // 我的订单 + | |-- orderDetail.vue // 订单详情 | |-- index.vue // 主页面 | |-- App.vue // 页面入口文件 | |-- main.js // 程序入口文件,加载各种公共组件 @@ -26,16 +36,19 @@ |-- vite.config.js // vite 配置文件 |-- package.json // 项目及工具的依赖配置文件 |-- README.md // 说明 +``` -## 安装依赖包 ## +```bash +# 安装依赖包 npm install -## 部署开发环境 ## +# 部署开发环境 npm run dev -## 打包 ## +# 打包 npm run build -## 打包后部署生产环境服务器 ## +# 打包后部署生产环境服务器 npm run serve +``` diff --git a/library-activity/src/assets/css/style.scss b/library-activity/src/assets/css/style.scss index 9d34ade..f0a42db 100644 --- a/library-activity/src/assets/css/style.scss +++ b/library-activity/src/assets/css/style.scss @@ -42,11 +42,13 @@ height: .5rem; background: url('@assets/images/back.png') no-repeat transparent; background-size: .5rem .5rem; + z-index: 9999; } P{ flex: 1; text-align: center; - font-size: .4rem; + font-size: .32rem; + margin-left: -.5rem; } .setting-header{ font-size: .32rem; @@ -149,6 +151,7 @@ font-style: normal; text-decoration: line-through; color: #FF3871; + } } .item-delt{ @@ -172,7 +175,7 @@ width: .5rem; height: .5rem; margin: .5rem 0 0 .32rem; - background: url('@assets/images/back.png') no-repeat transparent; + background: url('@assets/images/arrow-w.png') no-repeat transparent; background-size: .5rem .5rem; } } @@ -213,7 +216,7 @@ align-items: center; margin-top: .3rem; padding-top: .3rem; - border-top: 1px solid #C6C6E2; + border-top: 1px solid #f2f2f2; span{ display: block; padding: 0 .24rem; @@ -250,7 +253,7 @@ } .order-main { - padding: 2rem 0.32rem 0 0.32rem; + padding: 2rem 0.16rem 0 0.16rem; .van-tabs__wrap{ position: fixed; top: 1rem; @@ -266,7 +269,7 @@ // margin-left: -0.18rem; } .van-tab--grow { - padding: 0 0.18rem; + padding: 0 0.14rem; z-index: 222; } .van-tabs__nav { @@ -285,22 +288,9 @@ background-size: 0.48rem 0.2rem; } .van-tabs__content--animated{ - overflow: auto; + // overflow: auto; } } - -.order-main{ - .order-item { - .product-cont { - .author-date{ - p{ - background-color: #F4F6FC !important; - color: #717275 !important; - } - } - } - } -} .order-status { font-size: 0.28rem; color: #666; @@ -348,7 +338,7 @@ .bookItem-dialog-detail{ padding: .26rem; margin-bottom: .2rem; - border-bottom: 1px solid #C6C6E2; + // border-bottom: 1px solid #f2f2f2; .product-cont{ position: relative; padding-top: .3rem; @@ -380,8 +370,11 @@ font-size: .24rem; color: #757676; line-height: .36rem; + .txt-title{ + width: 1.42rem; + } .intro-txt{ - width: 3.4rem; + // width: 3.4rem; color: #191A1A; opacity: 1; } @@ -398,10 +391,25 @@ padding: .1rem 0 0 .1rem; font-size: .24rem; color: #FF3871; - text-decoration: line-through; i{ font-size: .18rem; } + em{ + text-decoration: line-through; + } } } +} + +.van-dialog{ + width: 6.86rem !important; +} + +.empty-data{ + padding-top: 0.875rem; + img{ + display: block; + width: 3.35rem; + margin: 0 auto; + } } \ No newline at end of file diff --git a/library-activity/src/assets/images/active-img.png b/library-activity/src/assets/images/active-img.png new file mode 100644 index 0000000..b1994db Binary files /dev/null and b/library-activity/src/assets/images/active-img.png differ diff --git a/library-activity/src/assets/images/empty.png b/library-activity/src/assets/images/empty.png new file mode 100644 index 0000000..b663359 Binary files /dev/null and b/library-activity/src/assets/images/empty.png differ diff --git a/library-activity/src/components/aitoast/aitoast.vue b/library-activity/src/components/aitoast/aitoast.vue deleted file mode 100644 index 5f00317..0000000 --- a/library-activity/src/components/aitoast/aitoast.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - - diff --git a/library-activity/src/components/verify/slide-verify.vue b/library-activity/src/components/verify/slide-verify.vue deleted file mode 100644 index b13f96e..0000000 --- a/library-activity/src/components/verify/slide-verify.vue +++ /dev/null @@ -1,477 +0,0 @@ - - - diff --git a/library-activity/src/router/index.js b/library-activity/src/router/index.js index 7d9ae5c..ec83847 100644 --- a/library-activity/src/router/index.js +++ b/library-activity/src/router/index.js @@ -9,6 +9,12 @@ const router = createRouter({ component: () => import('@/views/index.vue'), }, + { + path: '/ActiveDetail', + name: 'ActiveDetail', + component: () => + import('@/views/activeDetail/activeDetail.vue'), + }, { path: '/BookList', name: 'BookList', diff --git a/library-activity/src/views/activeDetail/activeDetail.vue b/library-activity/src/views/activeDetail/activeDetail.vue new file mode 100644 index 0000000..cc005c2 --- /dev/null +++ b/library-activity/src/views/activeDetail/activeDetail.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/library-activity/src/views/bookList/bookList.vue b/library-activity/src/views/bookList/bookList.vue index fc47c79..b559da9 100644 --- a/library-activity/src/views/bookList/bookList.vue +++ b/library-activity/src/views/bookList/bookList.vue @@ -2,7 +2,8 @@
-

活动书籍

+

开始选书

+
@@ -80,7 +81,7 @@

2023年07月

- 简介: + 简介:

精心提炼20种GPT提问方法及指令,从入门到进阶再到精通,100个案例带你玩

@@ -90,7 +91,7 @@

京东商城

实付款0

- 129.0 + 129.0
@@ -119,7 +120,7 @@ export default { }) onMounted(() => {}) let toBack = () => { - proxy.$router.go(-1); + proxy.$router.push({ path: '/' }) } let onLoad = () => { // 异步更新数据 @@ -141,11 +142,15 @@ export default { data.showDetial = false Toast('当前书籍已成功加入书车') } + let toCart = () => { + proxy.$router.push({ path: '/Cart' }) + } return { ...toRefs(data), toBack, addCart, - onLoad + onLoad, + toCart } }, } @@ -153,7 +158,7 @@ export default { diff --git a/library-activity/src/views/cart/cart.vue b/library-activity/src/views/cart/cart.vue index d0f8474..f2583eb 100644 --- a/library-activity/src/views/cart/cart.vue +++ b/library-activity/src/views/cart/cart.vue @@ -2,21 +2,21 @@
-
图书数量({{list.length + list2.length}})
+
图书数量({{list.length}})
{{ !isDeltHandle ? '管理' : '完成' }}
- +

你选书,我买单

京东商城

-
- +
+
@@ -29,7 +29,7 @@
精心提炼20种GPT提问方法及指令,从入门到进阶再到精通,100个案例带你玩
-

实付款 29.0129.0

+

实付款 29.0129.0

x1
@@ -39,43 +39,14 @@
-
-
- -
-

你选书,我买单

-

京东商城

-
-
-
-
- -
-
-
-
-

{{ item.id }}秒懂AI提问:让人工智能开发大脑

- -
精心提炼20种GPT提问方法及指令,从入门到进阶再到精通,100个案例带你玩
-
-
-

实付款 29.0129.0

- x1 - -
-
-
-
-
+
+
-
- 全选 +
+ 全选
合计:0

下单

@@ -84,6 +55,7 @@

删除

+ @@ -117,7 +89,7 @@

2023年07月

- 简介: + 简介:

精心提炼20种GPT提问方法及指令,从入门到进阶再到精通,100个案例带你玩

@@ -127,7 +99,7 @@

京东商城

实付款0

- 129.0 + 129.0
@@ -150,27 +122,20 @@ export default { let data = reactive({ tabCur: 1, activeSelect: false, - activeSelect2: false, allSelected: false, isDeltHandle: false, showDetial: false, list:[], - list2:[] + checkedCount: [] }) + onMounted(() => { for (let i = 0; i < 2; i++) { const json = {} - json.selected = false + json.checked = false json.id = data.list.length + 1 data.list.push(json); } - for (let i = 0; i < 1; i++) { - // data.list2.push(data.list2.length + 1); - const json = {} - json.selected = false - json.id = data.list2.length + 1 - data.list2.push(json); - } }) let goPay = () => { proxy.$router.push({ path: '/CartResult' }) @@ -185,20 +150,47 @@ export default { targetList.splice(index, 1) } } - let selectAll = (list , selectAll) => { - console.log(selectAll) - for (let item of list) { - item.selected = selectAll + + // 商品单选 + let handleSingle = (index) => { + const selectedProductsCount = data.list.filter(item => item.checked).length; + if (selectedProductsCount === 1 && !data.list.find(p => p.checked).checked) { + data.activeSelect = false; + } else { + data.activeSelect = selectedProductsCount === data.list.length; + } + } + + // 全选 + let handleselectedAll = () =>{ + data.list.forEach(item => { + item.checked = data.activeSelect; + }) + } + + let confirmDelt = () => { + if(data.activeSelect){ + data.list = [] + }else{ + const index = data.list.findIndex(p => p.checked); + if (index !== -1) { + data.list.splice(index, 1); + }else{ + Toast('请选择你需要删除的书籍') + } } } + return { ...toRefs(data), goPay, cartDelt, deltCurrentItem, - selectAll + handleselectedAll, + handleSingle, + confirmDelt } - }, + } } @@ -215,8 +207,10 @@ export default { justify-content: space-between; align-items: center; font-size: .32rem; - padding: .18rem .32rem; - background-color: #F4F4FC; + height: 1rem; + padding: 0 .32rem; + background-color: #fff; + box-shadow: 0 0.06rem 0.1rem 1px #EFECEC; z-index: 999; .cart-num{ font-size: .32rem; @@ -228,7 +222,7 @@ export default { } } .cart-list{ - padding-top: 1rem; + padding-top: 1.2rem; } .cart-item{ padding: .24rem; diff --git a/library-activity/src/views/feedback/feedback.vue b/library-activity/src/views/feedback/feedback.vue index 6eaee74..16c6294 100644 --- a/library-activity/src/views/feedback/feedback.vue +++ b/library-activity/src/views/feedback/feedback.vue @@ -44,7 +44,7 @@ export default { diff --git a/selfServiceMachine/src/views/module/bookList.vue b/selfServiceMachine/src/views/module/bookList.vue deleted file mode 100644 index 4db6002..0000000 --- a/selfServiceMachine/src/views/module/bookList.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - - diff --git a/selfServiceMachine/src/views/module/headerTop.vue b/selfServiceMachine/src/views/module/headerTop.vue deleted file mode 100644 index c95d898..0000000 --- a/selfServiceMachine/src/views/module/headerTop.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/selfServiceMachine/src/views/module/homeListItem.vue b/selfServiceMachine/src/views/module/homeListItem.vue deleted file mode 100644 index 4397d03..0000000 --- a/selfServiceMachine/src/views/module/homeListItem.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - -