From dd75674ff3fcb7dda44605262a169b89261c4b2e Mon Sep 17 00:00:00 2001 From: 77 <270260644@qq.com> Date: Mon, 14 Oct 2024 19:12:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=A7=AF=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=9E=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 16 + pages/app/sign.vue | 917 ++++++++++-------- .../commission/components/commission-menu.vue | 8 +- pages/goods/groupon.vue | 75 +- pages/goods/seckill.vue | 8 +- pages/index/user.vue | 17 +- pages/order/confirm.vue | 4 +- .../reservation_record/reservation_record.vue | 211 ++++ pages/subscribe/subscribe.vue | 52 +- .../components/s-block-item/s-block-item.vue | 106 +- .../s-goods-column/s-goods-column.vue | 2 +- .../s-groupon-block/s-groupon-block.vue | 4 +- sheep/components/s-layout/s-layout.vue | 2 +- sheep/components/s-menu-grid/s-menu-grid.vue | 138 ++- .../s-notice-block/s-notice-block.vue | 3 +- .../components/s-order-card/s-order-card.vue | 2 +- .../s-select-seckill-sku.vue | 4 +- sheep/components/s-user-card/s-user-card.vue | 11 +- .../s-wallet-card/s-wallet-card.vue | 2 +- static/images/seckilbg.png | Bin 36972 -> 84422 bytes 20 files changed, 976 insertions(+), 606 deletions(-) create mode 100644 pages/reservation_record/reservation_record.vue diff --git a/pages.json b/pages.json index fdc3184..d87cd70 100644 --- a/pages.json +++ b/pages.json @@ -46,6 +46,19 @@ "group": "商城" } }, + { + "path": "pages/reservation_record/reservation_record", + "style": { + "navigationBarTitleText": "预约记录", + "enablePullDownRefresh": true + }, + "meta": { + "auth": false, + "sync": true, + "title": "预约记录", + "group": "商城" + } + }, { "path": "pages/index/user", "style": { @@ -763,6 +776,9 @@ }, { "pagePath": "pages/index/user" + }, + { + "pagePath": "pages/index/category" } ] } diff --git a/pages/app/sign.vue b/pages/app/sign.vue index 30301cf..6268882 100644 --- a/pages/app/sign.vue +++ b/pages/app/sign.vue @@ -1,451 +1,608 @@ + .on { + background-color: #999 !important; + } + + .new-bg { + position: relative; + + .new-qdyl { + width: 100%; + } + + .new-title { + color: white; + font-size: 20px; + position: absolute; + top: 26px; + left: 50%; + transform: translateX(-50%); + } + + .new-left-title { + position: absolute; + bottom: 69px; + left: 20px; + + .top { + color: white; + } + + .bottom { + color: white; + font-size: 38px; + font-weight: 700; + } + } + } + .new-main{ + top:-57px; + position:relative; + .sign-list { + width: 80%; + margin: 0 auto; + padding: 20px; + background: white; + border-radius: 18px; + + .new-top { + display:flex; + justify-content: space-between; + margin-bottom:10px; + .left { + color:rgba(35,24,21,1); + font-size:25px; + font-weight:700; + .number{ + color:rgba(255,110,16); + margin: 0 5px; + } + } + + .right { + padding:5px 10px; + color:white; + font-size:20px; + background:rgba(255,139,43); + width: 62px; + border-radius: 20px; + text-align: center; + } + } + + .new-bottom { + display:flex; + flex-wrap:wrap; + .new-list { + padding:5px 5px; + background: rgba(255,247,239); + width:33%; + border-radius:12px; + .t { + width:100%; + color:black; + text-align:center; + } + + .c { + width:100%; + margin:5px 0; + .img{ + width:50px; + height:50px; + display:block; + margin:0 auto; + } + } + + .b { + width:100%; + color:rgba(176,144,122); + text-align:center; + } + } + } + } + + .new-qdsm { + .t {} + + .tt {} + } + } + + \ No newline at end of file diff --git a/pages/commission/components/commission-menu.vue b/pages/commission/components/commission-menu.vue index 592cb74..1f2777f 100644 --- a/pages/commission/components/commission-menu.vue +++ b/pages/commission/components/commission-menu.vue @@ -38,7 +38,7 @@ path: '/pages/commission/team', }, { - img: 'https://zysc.fjptzykj.com:3000/shangcheng/ec41e4f5b45c087232aab8d088019a1e9d781b9bde0f54ddbb18e90230b83255.png', + img: 'https://zysc.fjptzykj.com:3000/shangcheng/228c9cd847514f99ca1181b4d413c24e482ab46459a557e3b934facb32ab546d.png', title: '佣金明细', path: '/pages/commission/wallet', }, @@ -60,18 +60,18 @@ // }, // todo @芋艿：邀请海报需要登录后的个人数据 { - img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png', + img: 'https://zysc.fjptzykj.com:3000/shangcheng/f238f60d6e45080cdbbd294c344d3e2fc3a30c34ccb9345e931b0c5aa9e90645.png', title: '邀请海报', path: 'action:showShareModal', }, // TODO @芋艿：缺少 icon { - img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png', + img: 'https://zysc.fjptzykj.com:3000/shangcheng/d6bc7dbec1333e554a4781cbfae023e590a555dfca12784615023ae43bd2bf46.png', title: '推广排行', path: '/pages/commission/promoter', }, { - img: 'https://zysc.fjptzykj.com:3000/shangcheng/f9f9914bb3c1695055771cada0022c12bcf08fe3975485fc05ddd345c6f6e2a4.png', + img: 'https://zysc.fjptzykj.com:3000/shangcheng/4332d64835bb4aedc05636950f7cd7dcbab085f0f72f42eee4d87799947a7108.png', title: '佣金排行', path: '/pages/commission/commission-ranking', }, diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue index 93a7441..66d3423 100644 --- a/pages/goods/groupon.vue +++ b/pages/goods/groupon.vue @@ -75,7 +75,7 @@ - + @@ -94,42 +94,42 @@ :grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy" @change="onSkuChange" @close="onSkuClose" /> - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + @@ -616,4 +616,7 @@ top: -31px; // z-index: 2; } + .new-gonn{ + margin-bottom: 10px; + } \ No newline at end of file diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue index be78f9d..233a65c 100644 --- a/pages/goods/seckill.vue +++ b/pages/goods/seckill.vue @@ -32,7 +32,8 @@ - {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }} + {{ state.selectedSku.marketPrice || state.goodsInfo.marketPrice }} + @@ -86,7 +87,8 @@ v-if="state.goodsInfo.marketPrice" @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })"> - {{ fen2yuan(state.goodsInfo.marketPrice) }} + + {{state.goodsInfo.marketPrice}} 原价购买 @@ -99,7 +101,7 @@