From 6ae59c6af79f8fa32e6f07c8a68fafae8b466e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Sun, 30 Oct 2022 15:23:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E5=AE=A1=E6=A0=B8=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E6=A8=A1=E6=9D=BF=E5=BA=93=E9=A1=B5=E9=9D=A2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E8=80=8C=E5=AF=BC=E8=87=B4=E7=9A=84=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E3=80=82=E6=9A=82=E5=B0=86=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E4=BB=A3=E7=A0=81=E5=AD=98=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E4=BC=9A=E5=91=98QQ=E7=BE=A4=E5=86=85=EF=BC=8C=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E4=B8=8B=E8=BD=BD=E4=BD=BF=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Uni-App/CoreShop/pages.json | 34 - .../CoreShop/pages/category/index/index.vue | 2 +- .../CoreShop/pages/index/default/default.vue | 5 +- .../pages/template/diancan/index/index.vue | 190 ---- .../pages/template/diancan/list/list.scss | 90 -- .../pages/template/diancan/list/list.vue | 398 --------- .../CoreShop/pages/template/index/index.vue | 48 -- .../pages/template/zhunong/zhunong.scss | 60 -- .../pages/template/zhunong/zhunong.vue | 815 ------------------ .../CoreShop/static/images/common/cart.png | Bin 0 -> 1690 bytes 10 files changed, 3 insertions(+), 1639 deletions(-) delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/index/index.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.scss delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/template/index/index.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.scss delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.vue create mode 100644 CoreCms.Net.Uni-App/CoreShop/static/images/common/cart.png diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json index 62026943..bddfacd6 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages.json @@ -51,40 +51,6 @@ } ], "subpackages": [ - { - "root": "pages/template", - "name": "template", - "pages": [ - { - "path": "index/index", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "模板首页" - } - }, - { - "path": "zhunong/zhunong", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "助农农产品首页" - } - }, - { - "path": "diancan/index/index", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "点餐首页" - } - }, - { - "path": "diancan/list/list", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "点餐列表" - } - } - ] - }, { "root": "pages/article", "name": "article", diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue index bbd0b728..0e8a5eee 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue @@ -95,7 +95,7 @@ - + {{cartNums}} ￥{{cartMoney}} diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue index 3566140e..e9eef819 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue @@ -93,9 +93,8 @@ methods: { imgTap() { this.modalShow = false; - uni.navigateTo({ - url: "/pages/template/index/index" - }); + this.$u.toast('你点击了弹窗') + }, closeTap() { this.modalShow = false; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/index/index.vue deleted file mode 100644 index 4dc2c8ff..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/index/index.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.scss deleted file mode 100644 index 59c57426..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.scss +++ /dev/null @@ -1,90 +0,0 @@ -.main { width: 100%; height: 100%; /*position: relative;*/ display: flex; flex-direction: column; } - -.nav { width: 100%; height: 212rpx; flex-shrink: 0; display: flex; flex-direction: column; - .header { width: 100%; display: flex; align-items: center; justify-content: space-between; padding: 20rpx; background-color: #ffffff; height: 140rpx; - .left { flex: 1; display: flex; flex-direction: column; - .store-name { display: flex; justify-content: flex-start; align-items: center; font-size: 32rpx; margin-bottom: 10rpx; - .iconfont { margin-left: 10rpx; line-height: 100%; } - } - .store-location { display: flex; justify-content: flex-start; align-items: center; color: #919293; font-size: 24rpx; - .iconfont { vertical-align: middle; display: table-cell; color: #ADB838; line-height: 100%; } - } - } - .right { background-color: #F5F5F5; border-radius: 38rpx; display: flex; align-items: center; font-size: 24rpx; padding: 0 38rpx; color: #919293; - .dinein, .takeout { position: relative; display: flex; align-items: center; - &.active { padding: 14rpx 38rpx; color: #ffffff; background-color: #E8EACF; border-radius: 38rpx; } - } - .takeout { margin-left: 20rpx; height: 100%; flex: 1; padding: 14rpx 0; } - .dinein.active { margin-left: -38rpx; } - .takeout.active { margin-right: -38rpx; } - } - } - .coupon { flex: 1; width: 100%; background-color: #E8EACF; font-size: 28rpx; color: #ADB838; padding: 0 20rpx; display: flex; align-items: center; overflow: hidden; - .title { flex: 1; margin-left: 10rpx; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - .iconfont { line-height: 100%; } - } -} - .content { flex: 1; overflow: hidden; width: 100%; display: flex; - .menus { width: 200rpx; height: 100%; overflow: hidden; background-color: #F5F5F5; - .wrapper { width: 100%; height: 100%; - .menu { display: flex; align-items: center; justify-content: flex-start; padding: 30rpx 20rpx; font-size: 26rpx; color: #919293; position: relative; - &:nth-last-child(1) { margin-bottom: 130rpx; } - &.current { background-color: #ffffff; color: #5A5B5C; } - .dot { position: absolute; width: 34rpx; height: 34rpx; line-height: 34rpx; font-size: 22rpx; background-color: #ADB838; color: #ffffff; top: 16rpx; right: 10rpx; border-radius: 100%; text-align: center; } - } - } - } - - .goods { flex: 1; height: 100%; overflow: hidden; background-color: #ffffff; - .wrapper { width: 100%; height: 100%; padding: 20rpx; - .ads { height: calc(300 / 550 * 510rpx); - image { width: 100%; height: 100%; border-radius: 8rpx; } - } - .list { width: 100%; font-size: 28rpx; padding-bottom: 30rpx; - .category { width: 100%; - .title { padding: 30rpx 0; display: flex; align-items: center; color: #5A5B5C; - .icon { width: 38rpx; height: 38rpx; margin-left: 10rpx; } - } - } - .items { display: flex; flex-direction: column; padding-bottom: -30rpx; - .good { display: flex; align-items: center; margin-bottom: 30rpx; - .image { width: 160rpx; height: 160rpx; margin-right: 20rpx; border-radius: 8rpx; } - .right { flex: 1; height: 160rpx; overflow: hidden; display: flex; flex-direction: column; align-items: flex-start; justify-content: space-between; padding-right: 14rpx; - .name { font-size: 28rpx; margin-bottom: 10rpx; } - .tips { width: 100%; height: 40rpx; line-height: 40rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 24rpx; color: #919293; margin-bottom: 10rpx; } - .price_and_action { width: 100%; display: flex; justify-content: space-between; align-items: center; - .price { font-size: 28rpx; font-weight: 600; } - .btn-group { display: flex; justify-content: space-between; align-items: center; position: relative; - .btn { padding: 0 20rpx; box-sizing: border-box; font-size: 24rpx; height: 44rpx; line-height: 44rpx; - &.property_btn { border-radius: 24rpx; } - &.add_btn, - &.reduce_btn { padding: 0; width: 44rpx; border-radius: 44rpx; } - } - .dot { position: absolute; background-color: #ffffff; border: 1px solid #ADB838; color: #ADB838; font-size: 24rpx; width: 36rpx; height: 36rpx; line-height: 36rpx; text-align: center; border-radius: 100%; right: -12rpx; top: -10rpx; } - .number { width: 44rpx; height: 44rpx; line-height: 44rpx; text-align: center; } - } - } - } - } - } - } - } - } - } - - -.cart-box { position: fixed; bottom: 30rpx; left: 30rpx; right: 30rpx; height: 96rpx; border-radius: 48rpx; box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.2); background-color: #FFFFFF; display: flex; align-items: center; justify-content: space-between; z-index: 10; - .cart-img { width: 96rpx; height: 96rpx; position: relative; margin-top: -48rpx; } - .pay-btn { height: 100%; padding: 0 30rpx; color: #FFFFFF; border-radius: 0 50rpx 50rpx 0; display: flex; align-items: center; font-size: 28rpx; } - .mark { padding-left: 46rpx; margin-right: 30rpx; position: relative; - .tag { background-color: #FAB714; color: #ffffff; display: flex; justify-content: center; align-items: center; font-size: 24rpx; position: absolute; right: -10rpx; top: -50rpx; border-radius: 100%; padding: 4rpx; width: 40rpx; height: 40rpx; opacity: .9; } - } - .price { flex: 1; color: #5A5B5C; } -} - - - -.text-color-base { color: #5A5B5C; } -text-color-assist { color: #919293; } -.overflow-hidden { overflow: hidden !important; } -.text-truncate { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue deleted file mode 100644 index 353088be..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue +++ /dev/null @@ -1,398 +0,0 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/template/index/index.vue deleted file mode 100644 index a4eea006..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/template/index/index.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.scss b/CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.scss deleted file mode 100644 index 5f12be18..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.scss +++ /dev/null @@ -1,60 +0,0 @@ -/*.page { padding-top: 472rpx; position: relative; }*/ -.page { padding-top: 522rpx; position: relative; } - -swiper { display: flex; flex: 1; flex-direction: column; height: 600rpx; width: 750rpx; } - -swiper-item image, swiper-item video { height: 600rpx; vertical-align: middle; width: 750rpx; } - -.banner { left: 0; position: absolute; top: 0; z-index: 0; } - -.header-plate { position: relative; z-index: 999; } - -.index-title { color: #fff; font-size: 36rpx; font-weight: 600; left: 32rpx; position: absolute; } - -.index-search-btn { height: 80rpx; vertical-align: middle; width: 232rpx; } - -.search-form { height: 64rpx; width: 686rpx; } - -.newsletter { background: linear-gradient(180deg,#fff,#ffe8e8); height: 88rpx; } - -.divider-40 { background: #d8d8d8; height: 40rpx; width: 2rpx; } - -.spike-item { display: inline-block; height: 208rpx; margin-right: 32rpx; width: 532rpx; } - - .spike-item:last-child { margin-right: 0rpx; } - -.offer-item { display: inline-block; height: 366rpx; margin-right: 32rpx; width: 250rpx; } - - .offer-item:last-child { margin-right: 0rpx; } - -.index-market-banner { left: 0; position: absolute; top: 32rpx; z-index: 99; } - -.index-market { background: #ff3b3b; border-radius: 100rpx 100rpx 0rpx 0rpx; margin-top: 106rpx; padding-top: 94rpx; } - -.index-market-item-1 { display: inline-block; height: 298rpx; margin-right: 32rpx; width: 250rpx; } - - .index-market-item-1:last-child { margin-right: 0rpx; } - - .index-market-item-1 .goods { background: linear-gradient(270deg,#ff8328,#ffc555); border-radius: 18rpx; display: inline-block; height: 274rpx; margin-right: 32rpx; width: 250rpx; } - - .index-market-item-1 .price-tag { background: rgba(0,0,0,.5); border-radius: 0 12rpx 0 12rpx; left: 24rpx; padding: 3rpx 12rpx; position: absolute; top: 188rpx; } - - .index-market-item-1 .tag-btn { background: linear-gradient(90deg,#ff7f4e,#ff3b3b); border: 4rpx solid #ffe5bf; border-radius: 24rpx; bottom: 0rpx; height: 48rpx; left: 47rpx; position: absolute; width: 156rpx; z-index: 99; } - -.publicize-tags { background: #fff; border: 1rpx solid #ff8512; border-radius: 28rpx; padding: 4rpx 0rpx; } - -.index-cate-item { display: inline-block; text-align: center; } - -.cate-name { font-size: 28rpx; font-weight: 600; } - - .cate-name.current { color: #ff3b3b; font-size: 32rpx; } - -.current-underscore { background: linear-gradient(270deg,#ffc983,#ff3b3b); height: 6rpx; margin: 8rpx 44rpx 0rpx; width: 40rpx; } - -.cate-name-splitline { background: #e6e6e6; height: 40rpx; margin: 22rpx 32rpx 0rpx; width: 2rpx; } - -.index-goods .goods { -webkit-column-break-inside: avoid; border-radius: 18rpx; break-inside: avoid; margin-bottom: 24rpx; width: 326rpx; } - -.banner-bottom { bottom: -8rpx; left: 0; position: absolute; z-index: 99; } - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.vue b/CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.vue deleted file mode 100644 index 7835abec..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/template/zhunong/zhunong.vue +++ /dev/null @@ -1,815 +0,0 @@ - - - - \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/static/images/common/cart.png b/CoreCms.Net.Uni-App/CoreShop/static/images/common/cart.png new file mode 100644 index 0000000000000000000000000000000000000000..af85eeccb3aee82fc5c88c5574ca38a17f3deff5 GIT binary patch literal 1690 zcmV;L24(q)P)AjsGt$Jijp*B{8(AjsGt$k-ss z*B{H;BFWny|NsA~xe(dkob~nfu)ZP2)gSr$@5k34w8Iy(!WXo}7qY<@w#FCz{rcG6 zoVCRl{{H^lok{MOu@_V@4n{P_C%_SoH<8=J4_4 z=IF@J*m=XxS>@`p;peQ))^N(yX~54L^z`f6+S&2+*6Qrm@AA>B z=JogE^Y-5D?%mzp-SYL?>Fdz#@XYM+$?NaN>h8qh<-p(Ly5Z%x+~Ba?*FM0000ubW%=J0PFtAn}T3hK{DNNX(=HK z_VDWD&%(R4siTvPdTLKeIT6)l9RvEXt%!CR76C?54VOm5vXWDSA000D4NklGyJuzK z{U&EJ%)$xh$!@+pb9ZcKJ8QY0;@^C3J=_rEe9GHro6eKv;?o;rJlRVA`0riV0ORr2 zvQm6E)0=TRynV`1d<^MDIk!8=vqqz(u$#j1d@(!Q3+%bL+J!^ z7Tr$?$WIKNC6K-7zDq#9V`wjdoI&?e0`d|=X9#2ux^EJYZy4G`AZh5{NI>3TD2+f4 zpnEL=d5xh11hOApodl!~L;DFN7hSUiq!~lG1hO057nPK7?eE$!8DsSq4DBY69CYm} zDV3G6%1T0DbvuS~2xJ$!IhB<6hGD!X1Xj;sXcvK;MAxK!)GouQ4fCgE7+u<(G-2o@ zfn=k5mGu5lb+2K>0t^y}8Afk)DCw{D7|JG)6X-rALn6=dKq3qhLHRtA4Ecni69jS` z-AC=ST99bSoe_#!5bZucV(2)5q@o+qo_aKfp#XVWsA5s=8ymq;DuEnD*Qi{d*Xoe| z0bHII(ukp>1hNm^p#EuV>|4Q-#zM!(BJ4CNEZ5p;dZ{Z^_2Wm*E&Za0GTVdw~f zWTER;F1PZ+qWDbT`rucK@d7uZr5i(81ab&nr*gX$ixQtU&2M&K|hzum+$S_f1flwLFq$=zkD#Mvng+;<; zxPYm!ceo4}umf8uNGp-ybX$dm(&Bh3Ik1&Fw52L65-!7ej-|>R+U5x!*z!YL=>uEt zsr7HIE>mG1ZyC;|2etxn4sF?i?Uv)na1K{tK^Z10+$05QA~KvUr^5Wu z_L8H*GBSLL9@uU@&Y>+);ZZ5bD3Re*`@mKxjYNj?9Tk?5;e4XPMPeZ`oK+~CETY14 kAu@bX8gg;RcK-AH1-4N^VM;|O)c^nh07*qoM6N<$f@Jw$lK=n! literal 0 HcmV?d00001