diff --git a/library-activity/src/assets/css/style.scss b/library-activity/src/assets/css/style.scss index d1fa161..9d34ade 100644 --- a/library-activity/src/assets/css/style.scss +++ b/library-activity/src/assets/css/style.scss @@ -160,4 +160,248 @@ } } } +} + +.order-detail-header{ + width: 100%; + height: 3.87rem; + background: url('@assets/images/order-detail-img2.png') no-repeat left top; + background-size: contain; + .back{ + display: block; + width: .5rem; + height: .5rem; + margin: .5rem 0 0 .32rem; + background: url('@assets/images/back.png') no-repeat transparent; + background-size: .5rem .5rem; + } +} + +.order-main, +.order-detail{ + .order-item { + padding: 0.2rem 0.24rem 0.26rem 0.24rem; + margin-bottom: .2rem; + background: #fff; + // box-shadow: 0px 0.03rem 0.6rem 1px rgba(0, 0, 0, 0.08); + border-radius: 0.08rem; + .product-cont { + margin-top: 0.3rem; + } + .order-book-price { + display: flex; + flex-direction: column; + justify-content: flex-start; + text-align: right; + span { + &:first-child { + font-size: 0.32rem; + font-weight: bold; + i { + font-style: normal; + font-size: 0.2rem; + } + } + &:last-child { + font-size: 0.24rem; + } + } + } + .order-bottom{ + display: flex; + justify-content: flex-end; + align-items: center; + margin-top: .3rem; + padding-top: .3rem; + border-top: 1px solid #C6C6E2; + span{ + display: block; + padding: 0 .24rem; + margin-left: .3rem; + height: .6rem; + line-height: .64rem; + font-size: .28rem; + border: 0.02rem solid #000; + border-radius: .5rem; + &.order-btn02{ + color: #5A86F4; + border-color: #5A86F4; + } + } + } + } +} + +.order-dealer{ + display: flex; + justify-content: space-between; + align-items: center; + padding: .26rem 0 0 0; + .order-pay{ + font-size: .32rem; + span { + font-size: .4rem; + i{ + font-style: normal; + font-size: 0.24rem; + } + } + } +} + +.order-main { + padding: 2rem 0.32rem 0 0.32rem; + .van-tabs__wrap{ + position: fixed; + top: 1rem; + left: 0; + right: 0; + z-index: 99; + background-color: #fff; + } + .van-tab { + font-size: 0.32rem; + color: #858585; + z-index: 9999; + // margin-left: -0.18rem; + } + .van-tab--grow { + padding: 0 0.18rem; + z-index: 222; + } + .van-tabs__nav { + background: transparent; + padding: 0; + .van-tab--active { + font-weight: bold; + color: #000; + } + } + .van-tabs__line { + width: 0.48rem; + height: 0.2rem; + bottom: 10px; + background: url('@assets/images/order-icon.png') no-repeat; + background-size: 0.48rem 0.2rem; + } + .van-tabs__content--animated{ + 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; + &.dshe { + color: #5a86f4; + } + &.dhuo { + color: #ffb625; + } + &.jy { + color: #FE6902; + } +} + +.van-dialog{ + width: 6.1rem; + background: linear-gradient(180deg, #E8EEFD 0%, #FFFFFF 100%); + box-shadow: 0px .03rem .6rem 1px rgba(0,0,0,0.08); + border-radius: .16rem; +} + +.dialog-btn{ + display: flex; + justify-content: center; + align-items: center; + padding-bottom: .3rem; + span{ + display: block; + height: .8rem; + line-height: .8rem; + padding: 0 .68rem; + margin: 0 .2rem; + font-size: .32rem; + text-align: center; + background-color: #F4F4F9; + color: #414243; + border-radius: .5rem; + &.btn-comfired{ + color: #fff; + background-color: #5A86F4; + } + } +} + +.bookItem-dialog-detail{ + padding: .26rem; + margin-bottom: .2rem; + border-bottom: 1px solid #C6C6E2; + .product-cont{ + position: relative; + padding-top: .3rem; + .book-inventory{ + position: absolute; + top: 2rem; + left: 0; + font-size: .2rem; + padding: 0.06rem 0; + width: 1.18rem; + border: 1px solid #C6C6E2; + background-color: #F9F9FD; + border-radius: 0.08rem; + text-align: center; + p{ + opacity: .6; + } + span{ + i{ + font-style: normal; + color: #FF383D; + } + } + } + } + .bookItem-txt{ + display: flex; + justify-content: flex-start; + font-size: .24rem; + color: #757676; + line-height: .36rem; + .intro-txt{ + width: 3.4rem; + color: #191A1A; + opacity: 1; + } + } + .order-dealer{ + .dealer{ + opacity: 0.6; + } + } + .order-pay{ + display: flex; + align-items: center; + .yj-price{ + padding: .1rem 0 0 .1rem; + font-size: .24rem; + color: #FF3871; + text-decoration: line-through; + i{ + font-size: .18rem; + } + } + } } \ No newline at end of file diff --git a/library-activity/src/assets/images/arrow-w.png b/library-activity/src/assets/images/arrow-w.png new file mode 100644 index 0000000..51e69b3 Binary files /dev/null and b/library-activity/src/assets/images/arrow-w.png differ diff --git a/library-activity/src/assets/images/banner.png b/library-activity/src/assets/images/banner.png new file mode 100644 index 0000000..a0a7db1 Binary files /dev/null and b/library-activity/src/assets/images/banner.png differ diff --git a/library-activity/src/assets/images/book-arrow.png b/library-activity/src/assets/images/book-arrow.png new file mode 100644 index 0000000..9f77cab Binary files /dev/null and b/library-activity/src/assets/images/book-arrow.png differ diff --git a/library-activity/src/assets/images/card-img1.png b/library-activity/src/assets/images/card-img1.png new file mode 100644 index 0000000..960603a Binary files /dev/null and b/library-activity/src/assets/images/card-img1.png differ diff --git a/library-activity/src/assets/images/card-img2.png b/library-activity/src/assets/images/card-img2.png new file mode 100644 index 0000000..0b5c80b Binary files /dev/null and b/library-activity/src/assets/images/card-img2.png differ diff --git a/library-activity/src/assets/images/dialog-img1.png b/library-activity/src/assets/images/dialog-img1.png new file mode 100644 index 0000000..4fcef61 Binary files /dev/null and b/library-activity/src/assets/images/dialog-img1.png differ diff --git a/library-activity/src/assets/images/icon-copy.png b/library-activity/src/assets/images/icon-copy.png new file mode 100644 index 0000000..2be7349 Binary files /dev/null and b/library-activity/src/assets/images/icon-copy.png differ diff --git a/library-activity/src/assets/images/log-img1.png b/library-activity/src/assets/images/log-img1.png new file mode 100644 index 0000000..2bbeff1 Binary files /dev/null and b/library-activity/src/assets/images/log-img1.png differ diff --git a/library-activity/src/assets/images/log-img2.png b/library-activity/src/assets/images/log-img2.png new file mode 100644 index 0000000..b2ec308 Binary files /dev/null and b/library-activity/src/assets/images/log-img2.png differ diff --git a/library-activity/src/assets/images/log-img3.png b/library-activity/src/assets/images/log-img3.png new file mode 100644 index 0000000..5f6c23f Binary files /dev/null and b/library-activity/src/assets/images/log-img3.png differ diff --git a/library-activity/src/assets/images/log-img4.png b/library-activity/src/assets/images/log-img4.png new file mode 100644 index 0000000..ec957c0 Binary files /dev/null and b/library-activity/src/assets/images/log-img4.png differ diff --git a/library-activity/src/assets/images/log-img5.png b/library-activity/src/assets/images/log-img5.png new file mode 100644 index 0000000..45a5f9b Binary files /dev/null and b/library-activity/src/assets/images/log-img5.png differ diff --git a/library-activity/src/assets/images/mylending-img1.png b/library-activity/src/assets/images/mylending-img1.png new file mode 100644 index 0000000..b78831d Binary files /dev/null and b/library-activity/src/assets/images/mylending-img1.png differ diff --git a/library-activity/src/assets/images/mylending-img2.png b/library-activity/src/assets/images/mylending-img2.png new file mode 100644 index 0000000..306253a Binary files /dev/null and b/library-activity/src/assets/images/mylending-img2.png differ diff --git a/library-activity/src/assets/images/mylending-img3.png b/library-activity/src/assets/images/mylending-img3.png new file mode 100644 index 0000000..fa5442a Binary files /dev/null and b/library-activity/src/assets/images/mylending-img3.png differ diff --git a/library-activity/src/assets/images/mylending-img4.png b/library-activity/src/assets/images/mylending-img4.png new file mode 100644 index 0000000..464e81e Binary files /dev/null and b/library-activity/src/assets/images/mylending-img4.png differ diff --git a/library-activity/src/assets/images/mylending-img5.png b/library-activity/src/assets/images/mylending-img5.png new file mode 100644 index 0000000..fe91992 Binary files /dev/null and b/library-activity/src/assets/images/mylending-img5.png differ diff --git a/library-activity/src/assets/images/mylending-img6.png b/library-activity/src/assets/images/mylending-img6.png new file mode 100644 index 0000000..c61187c Binary files /dev/null and b/library-activity/src/assets/images/mylending-img6.png differ diff --git a/library-activity/src/assets/images/order-detail-img1.png b/library-activity/src/assets/images/order-detail-img1.png new file mode 100644 index 0000000..aa2b913 Binary files /dev/null and b/library-activity/src/assets/images/order-detail-img1.png differ diff --git a/library-activity/src/assets/images/order-detail-img2.png b/library-activity/src/assets/images/order-detail-img2.png new file mode 100644 index 0000000..5a0bc4e Binary files /dev/null and b/library-activity/src/assets/images/order-detail-img2.png differ diff --git a/library-activity/src/assets/images/order-detail-img3.png b/library-activity/src/assets/images/order-detail-img3.png new file mode 100644 index 0000000..c7dcaac Binary files /dev/null and b/library-activity/src/assets/images/order-detail-img3.png differ diff --git a/library-activity/src/assets/images/order-detail-img4.png b/library-activity/src/assets/images/order-detail-img4.png new file mode 100644 index 0000000..90047b4 Binary files /dev/null and b/library-activity/src/assets/images/order-detail-img4.png differ diff --git a/library-activity/src/assets/images/order-detail-img5.png b/library-activity/src/assets/images/order-detail-img5.png new file mode 100644 index 0000000..4a24043 Binary files /dev/null and b/library-activity/src/assets/images/order-detail-img5.png differ diff --git a/library-activity/src/assets/images/search.png b/library-activity/src/assets/images/search.png new file mode 100644 index 0000000..384d648 Binary files /dev/null and b/library-activity/src/assets/images/search.png differ diff --git a/library-activity/src/main.js b/library-activity/src/main.js index 2e8823b..fdeb862 100644 --- a/library-activity/src/main.js +++ b/library-activity/src/main.js @@ -17,7 +17,7 @@ import '@/assets/js/rem.js' import '@/assets/js/swiper6.min.js' import '@/assets/css/style.scss' -import { Toast, Swipe, SwipeItem, Popup, Picker, Tab, Tabs, Dialog, Uploader, DatetimePicker, Slider, Checkbox, CheckboxGroup, Form, Field, CellGroup, Area,Button } from 'vant'; +import { Toast, Swipe, SwipeItem, Popup, Picker, Tab, Tabs, Dialog, Uploader, DatetimePicker, Slider, Checkbox, CheckboxGroup, Form, Field, CellGroup, Area, Button, Progress, List} from 'vant'; import 'vant/lib/index.css'; @@ -130,7 +130,9 @@ app.use(Toast) .use(Field) .use(CellGroup) .use(Area) -.use(Button); +.use(Button) +.use(Progress) +.use(List); app.config.globalProperties.$API = $API app.config.globalProperties.$http = $http diff --git a/library-activity/src/router/index.js b/library-activity/src/router/index.js index 454dfdd..7d9ae5c 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: '/BookList', + name: 'BookList', + component: () => + import('@/views/bookList/bookList.vue'), + }, { path: '/Mine', name: 'Mine', @@ -56,6 +62,24 @@ const router = createRouter({ name: 'Order', component: () => import('@/views/order/order.vue'), + }, + { + path: '/OrderDetail', + name: 'OrderDetail', + component: () => + import('@/views/orderDetail/orderDetail.vue'), + }, + { + path: '/LogisticsInfo', + name: 'LogisticsInfo', + component: () => + import('@/views/logisticsInfo/logisticsInfo.vue'), + }, + { + path: '/MyLending', + name: 'MyLending', + component: () => + import('@/views/myLending/myLending.vue'), } ] }) diff --git a/library-activity/src/views/bookList/bookList.vue b/library-activity/src/views/bookList/bookList.vue new file mode 100644 index 0000000..fc47c79 --- /dev/null +++ b/library-activity/src/views/bookList/bookList.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/library-activity/src/views/cart/cart copy.vue b/library-activity/src/views/cart/cart copy.vue new file mode 100644 index 0000000..e582722 --- /dev/null +++ b/library-activity/src/views/cart/cart copy.vue @@ -0,0 +1,359 @@ + + + + + diff --git a/library-activity/src/views/cart/cart.vue b/library-activity/src/views/cart/cart.vue index 76ab896..d0f8474 100644 --- a/library-activity/src/views/cart/cart.vue +++ b/library-activity/src/views/cart/cart.vue @@ -2,26 +2,26 @@
-
图书数量(5)
+
图书数量({{list.length + list2.length}})
{{ !isDeltHandle ? '管理' : '完成' }}
-
+
- +

你选书,我买单

京东商城

-
- -
+
+ +
-

秒懂AI提问:让人工智能开发大脑

+

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

-
-
-
- -
-
-
-
-

秒懂AI提问:让人工智能开发大脑

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

实付款 29.0129.0

- x1 - +
@@ -60,22 +39,22 @@
-
+
- +

你选书,我买单

京东商城

-
- -
+
+ +
-

秒懂AI提问:让人工智能开发大脑

+

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

@@ -94,8 +73,9 @@
+
- 全选 + 全选
合计:0

下单

@@ -105,6 +85,56 @@
+ + +
+
+
+

你选书,我买单

+
+
+
+
+ +
+
+

剩余库存

+ 5 +
+
+
+

秒懂AI提问:让人工智能开发大脑

+
+ 著者: +

秋叶 刘进新 姜梅 定秋枫

+
+
+ 出版社: +

人民邮电出版社

+
+
+ 出版时间: +

2023年07月

+
+
+ 简介: +

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

+
+
+
+
+
+

京东商城

+
+

实付款0

+ 129.0 +
+
+
+
+ 关闭 +
+
@@ -119,20 +149,54 @@ export default { const { proxy } = getCurrentInstance() let data = reactive({ tabCur: 1, - checked: false, - isDeltHandle: false + activeSelect: false, + activeSelect2: false, + allSelected: false, + isDeltHandle: false, + showDetial: false, + list:[], + list2:[] }) - onMounted(() => {}) + onMounted(() => { + for (let i = 0; i < 2; i++) { + const json = {} + json.selected = 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' }) } let cartDelt = () =>{ data.isDeltHandle = !data.isDeltHandle + } + let deltCurrentItem = (type, itemIndex) =>{ + const targetList = type === 'active1' ? data.list : data.list2 + const index = targetList.findIndex(item => item.id === itemIndex) + if (index !== -1) { + targetList.splice(index, 1) + } + } + let selectAll = (list , selectAll) => { + console.log(selectAll) + for (let item of list) { + item.selected = selectAll + } } return { ...toRefs(data), goPay, - cartDelt + cartDelt, + deltCurrentItem, + selectAll } }, } @@ -260,4 +324,7 @@ export default { font-size: .28rem; } +.bookItem-dialog-detail{ + border-bottom: none; +} diff --git a/library-activity/src/views/cart/result.vue b/library-activity/src/views/cart/result.vue index b68c2b1..8afe26b 100644 --- a/library-activity/src/views/cart/result.vue +++ b/library-activity/src/views/cart/result.vue @@ -9,7 +9,7 @@

恭喜,您已成功下单

我们会尽快完成审核工作,请耐心等待!
- 查看订单 + 查看订单 再下一单
@@ -33,12 +33,22 @@ export default { let toBack = () => { proxy.$router.go(-1); } + let toOrder = (tabActive) => { + // proxy.$router.push({ path: '/Order' }) + proxy.$router.push({ + path: '/Order', + query: { + tabActive: tabActive + } + }) + } let toMoreOrder = () =>{ location.href = './'; } return { ...toRefs(data), toBack, + toOrder, toMoreOrder } }, diff --git a/library-activity/src/views/index.vue b/library-activity/src/views/index.vue index ca4116d..86abc4a 100644 --- a/library-activity/src/views/index.vue +++ b/library-activity/src/views/index.vue @@ -19,7 +19,7 @@

新书 · 选书· 下单· 借阅

- +
@@ -114,6 +114,9 @@ export default { if (userData) { } }) + let toBookList = () => { + proxy.$router.push({ path: '/BookList' }) + } let Encrypt = (o) => { if (typeof o === 'string') { if (o) { @@ -253,7 +256,6 @@ export default { console.log(res) }) } - /* 获取token 和用户信息 */ let getTokenAndUserInfo = () => { if (!location.search) { @@ -302,6 +304,7 @@ export default { } return { data, + toBookList, Encrypt, ToTryLogin, isLogin, diff --git a/library-activity/src/views/logisticsInfo/logisticsInfo.vue b/library-activity/src/views/logisticsInfo/logisticsInfo.vue new file mode 100644 index 0000000..6480ddd --- /dev/null +++ b/library-activity/src/views/logisticsInfo/logisticsInfo.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/library-activity/src/views/mine/mine.vue b/library-activity/src/views/mine/mine.vue index 929fb54..f4cdd6a 100644 --- a/library-activity/src/views/mine/mine.vue +++ b/library-activity/src/views/mine/mine.vue @@ -11,7 +11,7 @@

NO.10078398329

- 切换证号 + 切换证号
@@ -19,38 +19,38 @@

我的订单

- 查看全部 + 查看全部
-
+
1

待审核

-
+

待发货

-
+

待收货

-
+

已完成

-
+
@@ -62,7 +62,7 @@
-
+
顺丰速运 SF1629871960733
[鄂州市]快件离开 【湖北武昌转运中心】
@@ -71,16 +71,16 @@

我的借阅

- 查看全部 + 查看全部
-
+

借阅中

-
+
@@ -100,6 +100,39 @@
+ +
+
切换读者证
+
+ +
+ 读者证号 +

NO.10078398329

+
+
+
+
+ +
+ 读者证号 +

NO.10078398329

+
+
+
+
+ +
+ 读者证号 +

NO.10078398329

+
+
+
+
+
+ 确定 + 取消 +
+
@@ -113,10 +146,25 @@ export default { setup() { const { proxy } = getCurrentInstance() let data = reactive({ - tabCur: 2 + tabCur: 2, + showCard: false, + cardIndex: 0 }) - let toOrder = () => { - proxy.$router.push({ path: '/Order' }) + let toOrder = (tabActive) => { + proxy.$router.push({ + path: '/Order', + query: { + tabActive: tabActive + } + }) + } + let toLending = (tabActive) =>{ + proxy.$router.push({ + path: '/MyLending', + query: { + tabActive: tabActive + } + }) } let toMyAddress = () => { proxy.$router.push({ path: '/MyAddress' }) @@ -127,13 +175,23 @@ export default { let toFeedback = () => { proxy.$router.push({ path: '/Feedback' }) } + let toLogisticsInfo = () => { + proxy.$router.push({ path: '/LogisticsInfo' }) + } + let changeCardComfired = () => { + data.showCard = false + Toast('读者证切换成功') + } onMounted(() => {}) return { ...toRefs(data), toOrder, + toLending, toMyAddress, toAboutUs, - toFeedback + toFeedback, + toLogisticsInfo, + changeCardComfired } }, } @@ -341,4 +399,69 @@ export default { } } } + +.dialog-card{ + width: 6.12rem; + background: url('@assets/images/card-img1.png') no-repeat #fff left top; + background-size: 100% 2.45rem; + border-radius: .16rem; + h5{ + padding: 1.15rem .24rem .24rem .24rem; + font-size: .32rem; + } + .card-item{ + display: flex; + justify-content: space-between; + align-items: center; + margin: 0 .3rem .2rem .24rem; + padding: .18rem .24rem; + background: rgba(241,241,249,0.4); + border: 0.02rem solid #C6C6E2; + border-radius: 0.08rem; + img{ + display: block; + width: .8rem; + } + .card-txt{ + flex: 1; + margin-left: .2rem; + font-size: .32rem; + p{ + font-size: .24rem; + opacity: .6; + } + } + .select-card{ + width: .37rem; + height: .37rem; + border: 0.02rem solid #949497; + border-radius: 50%; + &.active{ + width: .41rem; + height: .41rem; + border: none; + background: url('@assets/images/selected.png') no-repeat; + background-size: .41rem .41rem; + } + } + } +} +.card-btn{ + padding: .2rem 0 .3rem 0; + span{ + display:block; + width: 4.3rem; + height: .8rem; + line-height: .8rem; + font-size: .32rem; + text-align: center; + margin: 0 auto; + border-radius: .4rem; + color: #666; + &:first-child{ + background-color: #5A86F4; + color: #fff; + } + } +} diff --git a/library-activity/src/views/myLending/myLending.vue b/library-activity/src/views/myLending/myLending.vue new file mode 100644 index 0000000..c9d02fe --- /dev/null +++ b/library-activity/src/views/myLending/myLending.vue @@ -0,0 +1,446 @@ + + + + + diff --git a/library-activity/src/views/order/order.vue b/library-activity/src/views/order/order.vue index f8fec57..23c2b4a 100644 --- a/library-activity/src/views/order/order.vue +++ b/library-activity/src/views/order/order.vue @@ -17,7 +17,7 @@
待审核
-
+
@@ -40,7 +40,7 @@

京东商城

实付款0

-
+
@@ -51,7 +51,7 @@
待发货
-
+
@@ -85,7 +85,7 @@
待收货
-
+
@@ -109,8 +109,8 @@

实付款0

- 查看物流 - 确认收货 + 查看物流 + 确认收货
@@ -123,7 +123,7 @@
已完成
-
+
@@ -147,7 +147,7 @@

实付款0

- 查看物流 + 查看物流
@@ -160,7 +160,7 @@
已取消
-
+
@@ -184,7 +184,7 @@

实付款0

- 删除订单 + 删除订单
@@ -199,7 +199,7 @@
待审核
-
+
@@ -236,7 +236,7 @@
待发货
-
+
@@ -272,7 +272,7 @@
待收货
-
+
@@ -296,8 +296,8 @@

实付款0

- 查看物流 - 确认收货 + 查看物流 + 确认收货
@@ -312,7 +312,7 @@
已完成
-
+
@@ -336,7 +336,7 @@

实付款0

- 查看物流 + 查看物流
@@ -351,7 +351,7 @@
已取消
-
+
@@ -375,7 +375,7 @@

实付款0

- 删除订单 + 删除订单
@@ -383,14 +383,36 @@
+ +
+ +

确认收货

+ 确定该订单已收到吗? +
+
+ 取消 + 确定 +
+
+ +
+ +

删除订单

+ 确定删除该订单吗? +
+
+ 取消 + 确定 +
+
diff --git a/library-activity/src/views/orderDetail/orderDetail.vue b/library-activity/src/views/orderDetail/orderDetail.vue new file mode 100644 index 0000000..077f865 --- /dev/null +++ b/library-activity/src/views/orderDetail/orderDetail.vue @@ -0,0 +1,269 @@ + + + + +