From f8c127a6cf4a67d3998a220bacec0742acf1783b Mon Sep 17 00:00:00 2001 From: chen <2659004835@qq.com> Date: Fri, 22 Oct 2021 11:07:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons/hengmei.css | 223 ++++-- components/foot-tab.vue | 3 +- components/shop-list.vue | 160 ++--- components/status-nav.vue | 7 +- jsFile/config.js | 3 +- jsFile/publicAPI.js | 32 + jsFile/requst.js | 2 +- jsFile/tools.js | 19 +- manifest.json | 11 +- pages.json | 84 +++ pages/login/login.vue | 7 +- pages/tabbar/my/staffDuan.vue | 441 ++++++++++++ pages/tabbar/shop/shop.vue | 168 ++++- pagesA/activityTask/activityTask.vue | 164 +++++ pagesA/coupon/coupon.vue | 154 +++++ pagesA/getReadyDan/getReadyDan.vue | 375 +++++++--- pagesA/immediatePayment/immediatePayment.vue | 153 ++++- pagesA/integralManage/integralManage.vue | 92 +++ pagesA/member/member.vue | 153 +++++ pagesA/myAddress/myAddress.vue | 352 ++++++++++ pagesA/myOrder/myOrder.vue | 229 +++++++ pagesA/peacockCoin/peacockCoin.vue | 103 +++ pagesA/pointsMall/pointsMall.vue | 166 +++++ pagesA/shopCart/shopCart.vue | 223 ++++-- pagesA/signIn/signIn.vue | 77 +++ pagesB/messagecenter/messagecenter.vue | 31 +- pagesB/myCollection/myCollection.vue | 99 ++- pagesB/orderDetail/orderDetail.vue | 10 +- pagesB/personalPoster/personalPoster.vue | 74 +- pagesB/shopDetail/shopDetail.vue | 643 +++++++++--------- static/public/address-down.png | Bin 0 -> 225 bytes static/public/address-top.png | Bin 0 -> 217 bytes static/public/address60.png | Bin 0 -> 1298 bytes static/public/addressClose.png | Bin 0 -> 2124 bytes static/public/birthday50.png | Bin 0 -> 2087 bytes static/public/dai-fa60.png | Bin 0 -> 882 bytes static/public/dai-fu60.png | Bin 0 -> 823 bytes static/public/dai-shou60.png | Bin 0 -> 1159 bytes static/public/dang-quan.png | Bin 0 -> 48705 bytes static/public/day60.png | Bin 0 -> 1313 bytes static/public/integral-01-108.png | Bin 0 -> 2652 bytes static/public/integral-02-108.png | Bin 0 -> 3045 bytes static/public/integral60.png | Bin 0 -> 970 bytes static/public/kong60.png | Bin 0 -> 1309 bytes static/public/member-head.png | Bin 0 -> 9744 bytes static/public/member-scor50.png | Bin 0 -> 2025 bytes static/public/member.png | Bin 0 -> 33150 bytes static/public/next-white.png | Bin 0 -> 294 bytes static/public/next-yellow.png | Bin 0 -> 255 bytes static/public/phone-02.png | Bin 0 -> 325 bytes static/public/quan-left-two.png | Bin 0 -> 2721 bytes static/public/quan-over.png | Bin 0 -> 3859 bytes static/public/quan-use.png | Bin 0 -> 3859 bytes static/public/quan60.png | Bin 0 -> 1238 bytes static/public/ren60.png | Bin 0 -> 966 bytes static/public/ru-hui50.png | Bin 0 -> 2314 bytes static/public/scor60.png | Bin 0 -> 960 bytes static/public/share-hai50.png | Bin 0 -> 2214 bytes static/public/sign-01.png | Bin 0 -> 75094 bytes static/public/sign-02.png | Bin 0 -> 13760 bytes static/public/sign-03.png | Bin 0 -> 1630 bytes static/public/signIn.png | Bin 0 -> 1405 bytes static/public/staff-about60.png | Bin 0 -> 889 bytes static/public/staff-collection60.png | Bin 0 -> 1025 bytes static/public/staff-hai60.png | Bin 0 -> 1226 bytes static/public/staff-head.png | Bin 0 -> 11377 bytes static/public/staff-msg60.png | Bin 0 -> 889 bytes static/public/staff-qro.png | Bin 0 -> 609 bytes static/public/staff-share.png | Bin 0 -> 1196 bytes static/public/staff-tou60.png | Bin 0 -> 1221 bytes static/public/staff-yue60.png | Bin 0 -> 1166 bytes static/public/task-01-60.png | Bin 0 -> 935 bytes static/public/task-02-60.png | Bin 0 -> 1631 bytes static/public/task-03-60.png | Bin 0 -> 1194 bytes static/public/task-04-60.png | Bin 0 -> 1922 bytes static/public/task-05-60.png | Bin 0 -> 1074 bytes static/public/te-quan50.png | Bin 0 -> 1826 bytes static/public/wan-60.png | Bin 0 -> 1270 bytes .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../mp-weixin/common/runtime.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../mp-weixin/components/backTop.js.map | 2 +- .../components/cate-items/cate-pu.js.map | 2 +- .../mp-weixin/components/empower.js.map | 2 +- .../mp-weixin/components/foot-tab.js.map | 2 +- .../mp-weixin/components/nothing-page.js.map | 2 +- .../components/public-customer.js.map | 2 +- .../simple-address/simple-address.js.map | 2 +- .../mp-weixin/components/status-nav.js.map | 2 +- .../mp-weixin/components/swiper-pu.js.map | 2 +- .../mp-weixin/components/wfalls-flow.js.map | 2 +- .../mp-weixin/pages/login/login.js.map | 2 +- .../pages/tabbar/pageHome/pageHome.js.map | 2 +- .../mp-weixin/pages/tabbar/shop/shop.js.map | 2 +- .../pagesA/nodifyData/nodifyData.js.map | 2 +- .../pagesB/messagecenter/messagecenter.js.map | 2 +- .../pagesB/myCollection/myCollection.js.map | 2 +- .../mp-weixin/pagesB/mysharer/mysharer.js.map | 2 +- .../personalPoster/personalPoster.js.map | 2 +- .../pagesB/searchPage/searchPage.js.map | 2 +- .../mp-weixin/pagesB/video/playVideo.js.map | 2 +- 101 files changed, 3573 insertions(+), 731 deletions(-) create mode 100644 pages/tabbar/my/staffDuan.vue create mode 100644 pagesA/activityTask/activityTask.vue create mode 100644 pagesA/coupon/coupon.vue create mode 100644 pagesA/integralManage/integralManage.vue create mode 100644 pagesA/member/member.vue create mode 100644 pagesA/myAddress/myAddress.vue create mode 100644 pagesA/myOrder/myOrder.vue create mode 100644 pagesA/peacockCoin/peacockCoin.vue create mode 100644 pagesA/pointsMall/pointsMall.vue create mode 100644 pagesA/signIn/signIn.vue create mode 100644 static/public/address-down.png create mode 100644 static/public/address-top.png create mode 100644 static/public/address60.png create mode 100644 static/public/addressClose.png create mode 100644 static/public/birthday50.png create mode 100644 static/public/dai-fa60.png create mode 100644 static/public/dai-fu60.png create mode 100644 static/public/dai-shou60.png create mode 100644 static/public/dang-quan.png create mode 100644 static/public/day60.png create mode 100644 static/public/integral-01-108.png create mode 100644 static/public/integral-02-108.png create mode 100644 static/public/integral60.png create mode 100644 static/public/kong60.png create mode 100644 static/public/member-head.png create mode 100644 static/public/member-scor50.png create mode 100644 static/public/member.png create mode 100644 static/public/next-white.png create mode 100644 static/public/next-yellow.png create mode 100644 static/public/phone-02.png create mode 100644 static/public/quan-left-two.png create mode 100644 static/public/quan-over.png create mode 100644 static/public/quan-use.png create mode 100644 static/public/quan60.png create mode 100644 static/public/ren60.png create mode 100644 static/public/ru-hui50.png create mode 100644 static/public/scor60.png create mode 100644 static/public/share-hai50.png create mode 100644 static/public/sign-01.png create mode 100644 static/public/sign-02.png create mode 100644 static/public/sign-03.png create mode 100644 static/public/signIn.png create mode 100644 static/public/staff-about60.png create mode 100644 static/public/staff-collection60.png create mode 100644 static/public/staff-hai60.png create mode 100644 static/public/staff-head.png create mode 100644 static/public/staff-msg60.png create mode 100644 static/public/staff-qro.png create mode 100644 static/public/staff-share.png create mode 100644 static/public/staff-tou60.png create mode 100644 static/public/staff-yue60.png create mode 100644 static/public/task-01-60.png create mode 100644 static/public/task-02-60.png create mode 100644 static/public/task-03-60.png create mode 100644 static/public/task-04-60.png create mode 100644 static/public/task-05-60.png create mode 100644 static/public/te-quan50.png create mode 100644 static/public/wan-60.png diff --git a/commons/hengmei.css b/commons/hengmei.css index 7e3f4ad..2ef2ef2 100644 --- a/commons/hengmei.css +++ b/commons/hengmei.css @@ -94,43 +94,135 @@ .btnBKS{height: 120rpx;} .lianShare{height: 90rpx;width: 220rpx;} .backH{width: 190rpx;height: 190rpx;top: -126rpx;} - +.addCart-btn{border-top-left-radius: 51rpx;border-bottom-left-radius: 51rpx;background-color: #3875F6;} +.mai-btn{border-top-right-radius: 51rpx;border-bottom-right-radius: 51rpx;background-color: #F85050;} /* 商城 */ -.activecate,.shopMo{width: 216rpx;height: 65rpx;border-radius: 20rpx;line-height: 65rpx;text-align: center;background-color: #f2f2f2;color: #333333;} -.activecate{color: #FFFFFF;} -.shopMo span::after,.activecate span::after{display: inline-block;content: '';width: 16rpx;height: 13rpx;margin-left: 6rpx;} -.shopMo span::after{background: url(/static/public/shopSJ.png) no-repeat;background-size: 100% 90%;} -.activecate span::after{background: url(/static/public/shopSJ-active.png) no-repeat;background-size: 100% 90%;transform: rotate(180deg);background-position: 0 2rpx;} +.shop-nav-box input{border: 2rpx solid #E0E0E0;padding: 0rpx 20rpx;height: 80rpx;line-height: 80rpx;} +.shop-nav-box>view:first-child view,.jf-input-box>view:first-child view{height: 80rpx;line-height: 80rpx;} .shop_list_box>view>view:last-child{margin-bottom: 200rpx;} - +.shop-nav-box .pad-zy50 view:nth-child(n+2){background: #3875F6;color: #FFFFFF;border-radius: 30rpx;padding: 8rpx 20rpx;font-size: 24rpx;display: flex;align-items: center;margin-right: 20rpx;margin-top: 30rpx;} +.shop-nav-box .mar-s40{height: 60rpx;border: 2rpx solid #E0E0E0;border-radius: 10rpx;width: 100%;box-sizing: border-box;padding-left: 20rpx;font-size: 24rpx;} +.shop-nav-box .mar-x30 view{font-size: 28rpx;width: 294rpx;height: 60rpx;border-radius: 10rpx;text-align: center;line-height: 60rpx; } +.shop-nav-box .mar-x30 view:first-child{background: #E6E6E6;color: #4D4D4D;} +.shop-nav-box .mar-x30 view:last-child{background: #3875F6;color: #FFFFFF;} .activebcate,.shopBMo{border-radius: 20rpx;background-color: #f2f2f2;color: #333333;padding: 12rpx 24rpx;} .activebcate{color: #FFFFFF;} - +.jf-input-box input{border: 2rpx solid #E0E0E0;padding: 0rpx 20rpx;height: 80rpx;line-height: 80rpx;} +.jf-input-box image{width: 16rpx;height: 13rpx;} +.jf-input-box image:last-child{margin-top: 4rpx;} +.cart-box{position: fixed;right: 30rpx;bottom: 200rpx;} +.cart-box .posir,.cart-box .posir image,.detail-cart-box .posir,.detail-cart-box .posir image{width: 112rpx;height: 112rpx;} +.cart-box .posia,.detail-cart-box .posia{background: #F85050;width: 36rpx;height: 36rpx;line-height: 36rpx;border-radius: 100%;color: #FFFFFF;font-size: 24rpx;text-align: center;top: 20rpx;right: 20rpx;} +.cart-box .posia view,.detail-cart-box .posia view{transform: scale(.8);} +.moban{background: rgba(0,0,0,.54);width: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 2;} +.detail-cart-box{position: fixed;right: 30rpx;bottom: 300rpx;} /* 商品详情 */ .activelei,.molei{border-radius: 20rpx;padding: 10rpx 24rpx;color: #333333;margin-left: 20rpx;} .activelei{color: #FFFFFF;} - - +.shop-title-box view{display: inline-block;float: left;} +.shop-title-box view span{padding: 6rpx 10rpx;} +.shop-title-box view span:nth-child(n+2){background: #F85050;} +.shop-price{color: #F85050;font-size: 40rpx;font-weight: bold;} +.shop-price span:last-child{color: #B3B3B3;font-size: 24rpx;text-decoration: line-through;font-weight: 400;margin-left: 20rpx;} +.yuan-price{color: #B3B3B3;font-size: 24rpx;text-decoration: line-through;font-weight: 400;} +.shar-box{margin-top: -20rpx;padding-bottom: 20rpx;} +.shar-box>view:first-child image{width: 42rpx;height: 30rpx;} +.shop-swiper{height: 280rpx;padding-top: 20rpx;} +.big-img{width: 70rpx;height: 70rpx; border-radius: 100%;} +.shop-swiper .bold{width: 140rpx;height: 80rpx;line-height: 80rpx;text-align: center;background: #F85050;border-radius: 20rpx;} +.duan-xian{border-bottom: 2rpx solid #E6E6E6;position: absolute;bottom: 0;width: 87%;right: 0;} +.bottom-popu,.order-cancle-tk{border-radius: 40rpx 40rpx 0rpx 0rpx;} +.bottom-popu>view:first-child image{width: 214rpx;height: 214rpx;border-radius: 15rpx;bottom: 0;flex-shrink: 0;margin-top: -107rpx;margin-right: 30rpx;} +.bottom-popu>view:first-child .width100 image{width: 24px;height: 24px;margin-top: -20rpx;} +.del-btn,.add-btn{width: 65rpx;height: 30px;} +.num-input{width: 80rpx;height: 28px;text-align: center;border-top: 2rpx solid #3875F6;border-bottom: 2rpx solid #3875F6;} +.ev-btn{width: 294rpx;height: 70rpx;line-height: 70rpx;text-align: center;border-radius: 10rpx;} +.pd-tk-box{position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 6;background: rgba(0,0,0,.54);display: flex;justify-content: center;align-items: center;} +.pd-tk-box .posir{font-weight: 500;text-align: center;margin: 0 85rpx;height: 458rpx;} +.pd-tk-box .posir view:nth-child(1){margin: 34rpx 0 27rpx 0;} +.pd-tk-box .posir view:nth-child(2){margin-bottom: 63rpx;} +.pd-tk-box .posir view:nth-child(3){margin-bottom: 77rpx;} +.pd-tk-box .posir view:nth-child(3) image:nth-child(1),.pd-tk-box .posir view:nth-child(3) image:nth-child(3){width: 100rpx;height: 100rpx;border-radius: 100%;} +.pd-tk-box .posir view:nth-child(3) image:nth-child(2){width: 42rpx;height: 42rpx;margin: 0 47rpx;} +.pd-tk-box .posir view:nth-child(4){width: 464rpx;height: 60rpx;line-height: 60rpx;color: #FFFFFF;background: #F85050;border-radius: 10rpx;margin: 0 auto;font-size: 28rpx;} +.pd-tk-box .posir>image{width: 77rpx;height: 77rpx;right: -30rpx;top: -30rpx;} +swiper-item view:last-child .duan-xian{border-bottom: none;} /* 准备下单 */ .activeT,.expressT{width: 124rpx;height: 60rpx;line-height: 60rpx;text-align: center;margin-left: 20rpx;border-radius: 20rpx;} .activeT{color: #FFFFFF;} .activeQuan::before{content: '';display: block;width: 50%;height: 8rpx;background: #3875F6;position: absolute;bottom: -20rpx;left: 50%;transform: translateX(-50%);} - - - +.xiaDan-next{width: 16px;height: 16px;flex-shrink: 0;} +.there{width: 90rpx;height: 86rpx;flex-shrink: 0;} +.order-image{width: 166rpx;height: 166rpx;border-radius: 15rpx;margin-right: 12rpx;} +.order-sy{font-size: 22rpx;color: #808080;font-weight: 500;margin-top: 6rpx;} +.order-item-price{color: #F85050;font-size: 32rpx;font-weight: bold;} +.goPayment{color: #FFFFFF;font-size: 28rpx;font-weight: bold;width: 170rpx;height: 70rpx;line-height: 70rpx;text-align: center;background: #3875F6;border-radius: 35rpx;margin-left: 10rpx;} +.quan-item-box{height: 200rpx;} +.quan-item-box>view:first-child{width: 218rpx;height: 200rpx;flex-shrink: 0;text-align: center;color: #FFFFFF;} +.quan-item-box>view:first-child image{width: 218rpx;height: 200rpx;left: 0;top: 0;} +.quan-item-box>view:last-child{display: flex;flex-direction: column;justify-content: space-between;width: 100%;height: 200rpx;padding: 0 20rpx;background-color: #F5F5F5;} +.quan-item-box>view:last-child image{float: right;} +.quan-list-box{max-height: 600rpx;} +.quan-list-box .mar-x40:last-child{margin-bottom: 0rpx;} +.ling-btn{font-size: 36rpx;color: #FFFFFF;font-weight: bold;margin: 0 auto;background: #3875F6;border-radius: 20rpx;height: 90rpx;line-height: 90rpx;text-align: center;margin-top: 156rpx;margin-bottom: 20rpx;} +/* 立即支付页面 */ +.chooseDX,.quan-item-box>view:last-child image{width: 40rpx;height: 40rpx;border-radius: 100%;} +.dao-box{padding: 55rpx 0 64rpx 0;text-align: center;} +.submit-pay{margin: 0 auto;color: #FFFFFF;font-weight: bold;font-size: 36rpx;text-align: center;width: 546rpx;height: 90rpx;line-height: 90rpx;background-color: #3875F6;border-radius: 20rpx;} +.success-btn{margin-bottom: 150rpx;} +.success-btn view{width: 244rpx;height: 70rpx;border-radius: 10rpx;text-align: center;line-height: 70rpx;} +.success-btn view:first-child{background: #E9E9E9;color: #333333;} +/* 购物车页面 */ +.edit-btn{width: 113rpx;height: 43rpx;border-radius: 20rpx;background: #3875F6;text-align: center;color: #FFFFFF;line-height: 43rpx;} +.cart-list-box{overflow: hidden;} +.cart-input-box{border-radius: 4rpx;overflow: hidden;} +.cart-input-box image{width: 46rpx;height: 26px;} +.cart-input-box input{width: 60rpx;height: 24px;text-align: center;border-top: 2rpx solid #3875F6;border-bottom: 2rpx solid #3875F6;} +.goBuy-btn{width: 170rpx;height: 70rpx;line-height: 70rpx;text-align: center;border-radius: 35rpx;} +.chooseAll-box{width: 40rpx;height: 40rpx;border-radius: 100%;border: 2rpx solid #3875F6;flex-shrink: 0;display: flex;justify-content: center;align-items: center;} +.chooseAll-box view{width: 24rpx;height: 24rpx;background-color: #3875F6;border-radius: 100%;} +.item-del-btn{width: 117rpx;height: 205rpx;background: #F85050;line-height: 205rpx;text-align: center;color: #FFFFFF;font-size: 24rpx;flex-shrink: 0;position: absolute;right: 0;bottom: 40rpx;top: 2rpx;} +/* 我的订单页面 */ +.order-item-box image{width: 166rpx;height: 166rpx;border-radius: 15rpx;margin-right: 12rpx;} +.order-btn{width: 140rpx;height: 50rpx;line-height: 50rpx;text-align: center;border-radius: 10rpx;background: #F85050;color: #FFFFFF;margin-left: 45rpx;} +.order-cancle{width: 140rpx;height: 50rpx;line-height: 50rpx;text-align: center;border-radius: 10rpx;background: #E9E9E9;color: #808080;} +.heyan-close{width: 96rpx;height: 96rpx;left: 50%;transform: translateX(-50%);bottom: -150rpx;} +.confirm-btn{font-size: 36rpx;color: #FFFFFF;font-weight: bold;margin: 0 auto;background: #3875F6;border-radius: 20rpx;height: 90rpx;line-height: 90rpx;text-align: center;margin: 80rpx 100rpx 20rpx 100rpx;} +/* 地址管理页面 */ +.address_active{width: 40rpx;height: 40rpx;} +.address_add{font-size: 30rpx;color: #FFFFFF;font-weight: bold;margin: 0 auto;background: #3875F6;border-radius: 20rpx;height: 90rpx;line-height: 90rpx;text-align: center;margin: 0 93rpx;} +.xiao-sanj image{width: 14rpx;height: 11rpx;} +.xiao-sanj image:last-child{margin-top: 4rpx;} +.address-btn-add{font-size: 30rpx;color: #FFFFFF;font-weight: bold;margin: 0 auto;background: #3875F6;border-radius: 20rpx;height: 90rpx;line-height: 90rpx;text-align: center;margin: 80rpx 76rpx 20rpx 76rpx;} +.address-close-btn{width: 77rpx;height: 77rpx;right: -55rpx;top: -36rpx;} +.info-box{background: #fff;left: 0;right: 0;top: 52rpx;height: 0rpx;transition: all 0.5s;border: 2rpx solid #E6E6E6;opacity: 0; z-index: 6;overflow: hidden;overflow-y: scroll;color: #666;} +.info-box view{margin: 10rpx;font-size: 24rpx;} +.dong {height: 200rpx;border: 2rpx solid #E6E6E6;opacity: 1;} +/* 优惠券页面 */ +.quan-btn{width: 136rpx;height: 48rpx;line-height: 48rpx;text-align: center;border-radius: 30rpx;background: #FFFFFF;color: #3875F6;margin-right: -10rpx;} +.quan-img{width: 218rpx;height: 200rpx;left: 0;top: 0;} +.quan-right-box{display: flex;flex-direction: column;justify-content: space-between;width: 100%;height: 200rpx;padding: 0 20rpx;background-color: #FFFFFF;} +.quan-use{width: 94rpx;height: 94rpx;right: 20rpx;top: 20rpx;} +.quan-tk-box{position: fixed;top: 0;left: 0;bottom: 0;right: 0;background: rgba(0,0,0,.54);z-index: 3;} +.quan-tk-btn{width: 96rpx;height: 96rpx;left: 50%;transform: translateX(-50%);bottom: -150rpx;} .bottoc{margin-top: 6rpx;color: #414141;} .opc{opacity: 0.7;} .width100{width: 100%;} .width33{width: 33%;} +.width45{width: 45%;} +.width50{width: 50%;} +.width55{width: 55%;} .posAll{position: fixed;top: 0;left: 0;right: 0;bottom: 0;background-color: rgba(0,0,0,.45);z-index: 12;} .posir{position: relative;} .posia{position: absolute;} +.poszy{position: fixed;left: 0;right: 0;z-index: 3;} .posiszy{position: fixed;left: 0;right: 0;z-index: 5;} .posixzy{position: fixed;left: 0;right: 0;z-index: 2;bottom: 0;} +.posia-op{position: absolute;top: 0;right: 0;left: 0;bottom: 0;opacity: 0;} .syxzo{top: 0;left: 0;right: 0;bottom: 0;opacity: 0;} @@ -147,6 +239,9 @@ .flexs{flex-shrink: 0;} +.wh42{width: 42rpx;height: 42rpx;} +.wh44{width: 44rpx;height: 44rpx;} + button:after{content: none!important;} .borbot{border-bottom: 2rpx solid #E6E6E6;} .borbot:last-child{border-bottom: none;} @@ -154,11 +249,65 @@ button:after{content: none!important;} .borbot-df{border: 2rpx solid #DFDFDF;} .borbot-cc{border: 2rpx solid #CCCCCC;} +.line-h50{line-height: 50rpx;} + .clips1{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;} .clips2{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;} .clips3{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;text-overflow: ellipsis;word-wrap: break-word;word-break:break-all;} + +/* 字体大小 */ +.fon20{font-size: 20rpx;} +.fon24{font-size: 24rpx;} +.fon25{font-size: 25rpx;} +.fon26{font-size: 26rpx;} +.fon27{font-size: 27rpx;} +.fon28{font-size: 28rpx;} +.fon30{font-size: 30rpx;} +.fon32{font-size: 32rpx;} +.fon34{font-size: 34rpx;} +.fon36{font-size: 36rpx;} +.fon38{font-size: 38rpx;} +.fon40{font-size: 40rpx;} +.fon56{font-size: 56rpx;} + +/* 字体颜色 */ +.colf{color: #FFFFFF;} +.colb{color: #000000;} +.colc{color: #CCCCCC;} +.col3{color: #333333;} +.col6{color: #666666;} +.colf8{color: #F85050;} +.col9{color: #999999;} +.pcol{color: #3875F6;} +.col2c{color: #2C2C2C;} +.col80{color: #808080;} +.col7D{color: #7D7D7D;} +.colB3{color: #B3B3B3;} +/* 字体位置 */ +.tc{text-align: center;} +.tright{text-align: right;} + +/* 粗体 */ +.bold{font-weight: bold;} + + +/* 背景颜色 */ +.pbackc{background-color: #3875F6;} +.bacf{background-color: #FFFFFF;} +.bcdb{background-color: #DBDBDB;} +.bcf8{background: #F85050;} + +/* 圆角 */ +.radius10{border-radius: 10rpx;} +.radius15{border-radius: 15rpx;} +.radius20{border-radius: 20rpx;} +.radius30{border-radius: 30rpx;} +.radius35{border-radius: 35rpx;} +.radius40{border-radius: 40rpx;} +.radius45{border-radius: 45rpx;} + /* 上下左右---外边距 */ .mar10{margin: 10rpx;} .mar20{margin: 20rpx;} @@ -289,50 +438,10 @@ button:after{content: none!important;} .pad-y40{padding-right: 40rpx;} .pad-y50{padding-right: 50rpx;} - - -/* 字体大小 */ -.fon20{font-size: 20rpx;} -.fon24{font-size: 24rpx;} -.fon25{font-size: 25rpx;} -.fon26{font-size: 26rpx;} -.fon27{font-size: 27rpx;} -.fon28{font-size: 28rpx;} -.fon30{font-size: 30rpx;} -.fon32{font-size: 32rpx;} -.fon34{font-size: 34rpx;} -.fon36{font-size: 36rpx;} -.fon38{font-size: 38rpx;} -.fon40{font-size: 40rpx;} - -/* 字体颜色 */ -.colf{color: #FFFFFF;} -.colb{color: #000000;} -.colc{color: #CCCCCC;} -.col3{color: #333333;} -.col6{color: #666666;} -.col9{color: #999999;} -.pcol{color: #3875F6;} -.col2c{color: #2C2C2C;} -.col80{color: #808080;} -/* 字体位置 */ -.tc{text-align: center;} -.tright{text-align: right;} - -/* 粗体 */ -.bold{font-weight: bold;} - - -/* 背景颜色 */ -.pbackc{background-color: #3875F6;} -.bacf{background-color: #FFFFFF;} -.bcdb{background-color: #DBDBDB;} - -/* 圆角 */ -.radius10{border-radius: 10rpx;} -.radius15{border-radius: 15rpx;} -.radius20{border-radius: 20rpx;} -.radius30{border-radius: 30rpx;} +.pad-sx27-zy20{padding: 27rpx 20rpx;} + + + diff --git a/components/foot-tab.vue b/components/foot-tab.vue index 45efc9c..ad1f31f 100644 --- a/components/foot-tab.vue +++ b/components/foot-tab.vue @@ -141,7 +141,8 @@ if(!this.jieDuan){ let isAuth = this.$toolAll.tools.returnAuth() if(!isAuth){ - uni.reLaunch({url:'/pages/tabbar/my/my'}) + // uni.reLaunch({url:'/pages/tabbar/my/my'}) + uni.reLaunch({url:'/pages/tabbar/my/staffDuan'}) } else this.jieDuan = true } break; diff --git a/components/shop-list.vue b/components/shop-list.vue index 8386361..9b2af0a 100644 --- a/components/shop-list.vue +++ b/components/shop-list.vue @@ -1,97 +1,77 @@