diff --git a/components/detail-prize-log/detail-prize-log.vue b/components/detail-prize-log/detail-prize-log.vue index 937d060..d3160a8 100644 --- a/components/detail-prize-log/detail-prize-log.vue +++ b/components/detail-prize-log/detail-prize-log.vue @@ -1,233 +1,219 @@ \ No newline at end of file + // 空数据提示 + .empty-tip { + text-align: center; + padding: 40rpx 0; + color: #999; + font-size: 28rpx; + } + } + \ No newline at end of file diff --git a/package/index/leitai.vue b/package/index/leitai.vue index 2157341..1845aab 100644 --- a/package/index/leitai.vue +++ b/package/index/leitai.vue @@ -4,359 +4,318 @@ * @Description: content --> \ No newline at end of file diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue index b99c89a..9fa08b5 100644 --- a/package/index/lian-ji.vue +++ b/package/index/lian-ji.vue @@ -6,82 +6,115 @@ + - {{buyNum}} @@ -196,35 +228,27 @@ - - - - - - - - - - {{pageData.goods?pageData.goods.user_lian_ji_number:0}}/{{pageData.goods?pageData.goods.lian_ji_num:0}} + + + cp: + {{pageData.goods?pageData.goods.user_lian_ji_number:0}}/{{pageData.goods?pageData.goods.lian_ji_num:0}} - 连击{{ pageTabCur==0?buyNum:0}}次 + 连击{{ pageTabCur==0?buyNum:0}}次 - 连击 - MAX + + + + {{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝 - {{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝 @@ -345,24 +369,8 @@ - - 选择优惠方式 - - - 优惠券 - - - {{ - couponData && orderData.coupon_price > 0 - ? `-${couponData.price}` - : '未选择' - }} - - - - - - + + + + + + + + 优惠券 + + + {{ + couponData && orderData.coupon_price > 0 + ? `-${couponData.price}` + : '未选择' + }} + + + - 选择支付方式 - + + + - - 使用吧唧币抵扣¥ - {{ orderData.use_integral_money }} (剩余:{{ orderData.integral }}个) + + 使用{{$config.getAppSetting('currency1_name')}}抵扣¥{{ orderData.use_integral_money }} (剩余:{{ orderData.integral }}个) @@ -388,9 +414,9 @@ - - 星钻支付¥ - {{ orderData.use_money }} (剩余:{{ orderData.money }}) + + {{$config.getAppSetting('balance_name')}}支付¥{{ orderData.use_money }} (剩余:{{ orderData.money }}) @@ -516,16 +542,16 @@ }, onShareAppMessage() { - if(this.$refs["couponPop"]!=null){ - var co= this.$refs["couponPop"].getfengxiaodata(); - if(co!=null){ + if (this.$refs["couponPop"] != null) { + var co = this.$refs["couponPop"].getfengxiaodata(); + if (co != null) { console.log(co); return co; } } - + return { - title: this.$config.getAppSetting("app_name")+`${this.pageData.goods.title}系列`, + title: this.$config.getAppSetting("app_name") + `${this.pageData.goods.title}系列`, imageUrl: this.pageData.goods.imgurl_detail, path: '/package/index/lian-ji' + this.$c.qs({ @@ -757,7 +783,7 @@ } } - if (this.$refs.buyNotice.getIsShow() && !fromNotice) { + if (this.$refs.buyNotice.getIsShow() && !fromNotice) { this.$refs.buyNotice.getRule(6) return } @@ -936,7 +962,6 @@ z-index: 100; >view { - font-family: YouSheBiaoTiHei; font-weight: 400; font-size: 50rpx; color: #FFFFFF; @@ -945,6 +970,7 @@ .content { padding: 0 0 300rpx; + background-color: #FFFFFF; image { width: 100%; @@ -953,20 +979,20 @@ } .page-tab { - padding: 80rpx 0 0; - height: 100rpx; + margin: 36rpx auto 0; + width: 532rpx; + height: 72rpx; z-index: 10; + border: 2rpx solid #F5F5F5; + border-radius: 16rpx; .page-tab-item { - height: 67rpx; + width: 266rpx; + height: 72rpx; position: relative; font-weight: 500; font-size: 24rpx; - color: #FFFFFF; - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 28rpx; - color: #FFFFFF; + color: #333333; >image { width: 40rpx; @@ -974,27 +1000,32 @@ } >text { - white-space: nowrap; + width: 532rpx; + height: 72rpx; + display: flex; + align-items: center; + justify-content: center; + border-radius: 16rpx; + background-color: #FFFFFF; padding: 0 20rpx; } &.act { text { - font-weight: 400; - font-size: 50rpx; - text-shadow: #894DD3 1rpx 0 0, #894DD3 0 1rpx 0, #894DD3 -1rpx 0 0, #894DD3 0 -1rpx 0; + color: #D8FD24; + background-color: #333333; } } } } .page-hd { - width: 694rpx; - height: 580rpx; + width: 100%; + height: 750rpx; box-sizing: border-box; - padding: 90rpx 14rpx 0; position: relative; - margin: -60rpx auto 0; + margin-top: 150rpx; + background-color: #FFFFFF; .half-tag { width: 160rpx; @@ -1012,22 +1043,43 @@ .link-num { position: absolute; - right: 0; - top: 120rpx; - min-width: 152rpx; - height: 58rpx; - z-index: 1; + left: 50%; + transform: translateX(-50%); + bottom: 168rpx; + min-width: 128rpx; + height: 40rpx; + background-color: rgba(51, 51, 51, 0.50); + z-index: 10; box-sizing: border-box; - padding-right: 20rpx; - font-family: YouSheBiaoTiHei; font-weight: 400; - font-size: 32rpx; - color: #FFFFFF; + font-size: 20rpx; + color: #FECF97; + } + + .swiper_view1 { + position: absolute; + width: 56rpx; + height: 56rpx; + top: 346rpx; + left: 32rpx; + background: rgba(51, 51, 51, 0.5); + border-radius: 50%; + z-index: 10; + } + + .swiper_view2 { + position: absolute; + width: 56rpx; + height: 56rpx; + top: 346rpx; + right: 32rpx; + background: rgba(51, 51, 51, 0.5); + border-radius: 50%; + z-index: 10; } .swiperAll { - height: 401rpx; - margin-top: 0rpx; + height: 100%; >view { width: 74rpx; @@ -1044,34 +1096,44 @@ } .swiper { - width: 480rpx; - height: 300rpx; + width: 100%; + height: 100%; .swiper-item { display: flex; justify-content: center; align-items: center; - width: 329rpx; - height: 300rpx; + width: 100%; + height: 100%; } } + .goods-name { + z-index: 10; + position: absolute; + bottom: 24rpx; + left: 50%; + transform: translateX(-50%); + font-size: 24rpx; + color: #FFFFFF; + } + .swiperItemInfo { + min-width: 280rpx; + height: 44rpx; position: absolute; left: 50%; transform: translateX(-50%); - bottom: 20rpx; + bottom: 78rpx; font-weight: 500; - font-size: 28rpx; + z-index: 10; + font-size: 24rpx; + background: url($imgurl + "index/leitai.png") no-repeat 0 0 / 100% 100%; >text:nth-child(1) { - width: 200rpx; - color: #FFFFFF; + color: #333333; } - >text:nth-child(2) { - color: #FFFFFF; - } } .goods-title { @@ -1088,28 +1150,28 @@ text { font-size: 36rpx; - font-family: YouSheBiaoTiHei; font-weight: 400; color: #ffffff; } } .user-btns { - padding: 0 30rpx; display: flex; + position: absolute; + bottom: 136rpx; + left: 50%; + transform: translateX(-50%); justify-content: space-between; align-items: center; - position: relative; z-index: 1; .user-num { display: flex; align-items: center; - font-size: 24rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #dddddd; + font-size: 18rpx; + font-weight: 500; + color: #FFFFFF; .user-list { display: flex; @@ -1117,14 +1179,13 @@ padding-right: 10rpx; .avatar { - width: 50rpx; - height: 50rpx; + width: 24rpx; + height: 24rpx; background: #7f7f7f; - border: 1px solid #cccccc; border-radius: 50%; box-sizing: border-box; position: relative; - margin-left: -26rpx; + margin-left: -16rpx; } } } @@ -1166,34 +1227,72 @@ display: flex; align-items: center; - .tab-item { - width: 192rpx; - height: 54rpx; - font-family: YouSheBiaoTiHei; + .tab-item1 { + width: 160rpx; + height: 92rpx; + font-weight: 400; + margin-right: 30rpx; + background: url($imgurl + "index/uncheckTab1.png") no-repeat 0 0 / 100% 100%; + + >text { + font-weight: 600; + font-size: 24rpx; + color: #333333; + } + } + + .tab-item2 { + width: 160rpx; + height: 92rpx; font-weight: 400; - font-size: 32rpx; - color: #CCCCCC; margin-right: 30rpx; &.act { - background: url($imgurl+'index/checkTab.png') no-repeat 0 0 / 100% 100%; + background: url($imgurl + "index/checkTab2.png") no-repeat 0 0 / 100% 100%; >text { - font-weight: 400; - font-size: 32rpx; - color: #FFFFFF; - text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0; + font-weight: 600; + font-size: 24rpx; + color: #333333; } } &.unact { - background: url($imgurl+'index/uncheckTab.png') no-repeat 0 0 / 100% 100%; + background: url($imgurl + "index/uncheckTab2.png") no-repeat 0 0 / 100% 100%; >text { - font-weight: 400; - font-size: 28rpx; - color: #D6D6D6; + font-weight: 600; + font-size: 24rpx; + color: #333333; } + + } + } + + .tab-item3 { + width: 160rpx; + height: 92rpx; + font-weight: 400; + + &.act { + background: url($imgurl + "index/checkTab3.png") no-repeat 0 0 / 100% 100%; + + >text { + font-weight: 600; + font-size: 24rpx; + color: #333333; + } + } + + &.unact { + background: url($imgurl + "index/uncheckTab3.png") no-repeat 0 0 / 100% 100%; + + >text { + font-weight: 600; + font-size: 24rpx; + color: #333333; + } + } } } @@ -1215,7 +1314,7 @@ } .list { - padding: 1rpx 20rpx 0; + padding: 40rpx 20rpx 0; .list-item { box-sizing: border-box; @@ -1225,14 +1324,14 @@ >view:nth-child(1) { >image { - width: 160rpx; - height: 72rpx; + width: 56rpx; + height: 56rpx; } >text { font-weight: 400; font-size: 20rpx; - color: #FFFFFF; + color: #999999; } } } @@ -1246,12 +1345,13 @@ .goods-item { display: inline-flex; width: 220rpx; + background-color: #F8F8F8; + border-radius: 16rpx; .pic { width: 220rpx; height: 220rpx; - border-radius: 12rpx; - border: 2rpx solid #FFFFFF; + border-radius: 16rpx 16rpx 0rpx 0rpx; position: relative; margin: 0 auto; @@ -1272,18 +1372,18 @@ .title { width: 200rpx; - margin: 20rpx auto 0; - font-size: 24rpx; - font-weight: 400; - color: #ffffff; + margin: 28rpx auto 0; + font-size: 20rpx; + font-weight: 500; + color: #333333; } .price { width: 200rpx; - margin: 12rpx auto 0; - font-weight: 400; - font-size: 20rpx; - color: #FFFFFF; + margin: 24rpx auto 28rpx; + font-weight: 500; + font-size: 16rpx; + color: #333333; } } } @@ -1292,30 +1392,23 @@ .sub-tab { white-space: nowrap; - padding: 10rpx 0 10rpx; + padding: 40rpx 0 10rpx; .sub-tab-item { display: inline-flex; align-items: center; justify-content: center; min-width: 88rpx; - height: 40rpx; + height: 44rpx; margin-left: 30rpx; - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 28rpx; - color: #FFFFFF; - background: #3B3941; + font-weight: 500; + font-size: 20rpx; + color: #333333; + background: #F5F5F5; border-radius: 8rpx; - border: 2rpx solid rgba(#FFFFFF, 0.7); &.act { - background: #B07AF3; - border: 2rpx solid #FFFFFF; - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 28rpx; - color: #FFFFFF; + background: #E6F791; } &:last-child { @@ -1333,14 +1426,12 @@ padding: 0 20rpx; display: flex; align-items: center; - background: #3B3941; + background: #F8F8F8; margin-top: 24rpx; .avatar { - width: 80rpx; - height: 80rpx; - background: #9d9d9d; - border: 1px solid #cccccc; + width: 76rpx; + height: 76rpx; border-radius: 50%; overflow: hidden; } @@ -1350,48 +1441,43 @@ margin-left: 20rpx; .name { - font-size: 28rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #ffffff; + font-size: 20rpx; + font-weight: 500; + color: #333333; } .hang1 {} .time { - margin-top: 10rpx; + margin-top: 12rpx; white-space: nowrap; - - font-size: 24rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #dddddd; + font-size: 16rpx; + font-weight: 500; + color: #999999; } } .prize { flex: 1; - padding-left: 50rpx; + padding-left: 80rpx; display: flex; align-items: center; .pic { - width: 100rpx; - height: 100rpx; + width: 76rpx; + height: 76rpx; + border-radius: 16rpx; } >view:nth-child(2) { >view:nth-child(1) { - padding: 0 20rpx; - min-width: 92rpx; - height: 40rpx; + min-width: 68rpx; + height: 32rpx; box-sizing: border-box; line-height: 40rpx; - background: #B07AF3; - border-radius: 8rpx; - border: 2rpx solid #FFFFFF; - font-weight: 400; - font-size: 24rpx; + border-radius: 18rpx; + font-weight: 500; + font-size: 14rpx; color: #FFFFFF; } @@ -1400,17 +1486,16 @@ .title { width: 120rpx; margin-left: 10rpx; - font-weight: 400; - font-size: 24rpx; - color: #FFFFFF; + font-weight: 500; + font-size: 16rpx; + color: #333333; text-align: right; } .num { - font-size: 24rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #ffffff; + font-size: 16rpx; + font-weight: 500; + color: #333333; } } } @@ -1526,52 +1611,65 @@ box-sizing: border-box; width: 100%; padding: 30rpx 30rpx 80rpx; - background: #141317; + background: #FFFFFF; &-numBox { width: 224rpx; height: 92rpx; - padding: 0 8rpx; - margin: 0 50rpx; - background: url($imgurl+'index/numBox.png') no-repeat 0 0 / 100% 100%; + position: absolute; + left: 50%; + transform: translateX(-50%); + // background: url($imgurl+'index/numBox.png') no-repeat 0 0 / 100% 100%; >image { - width: 58rpx; - height: 72rpx; + width: 52rpx; + height: 52rpx; } >text { - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 50rpx; - color: #FFFFFF; + font-weight: 500; + font-size: 24rpx; + color: #333333; } } &-btns { - margin: -10rpx; + margin: 30rpx 0 0; + border: 2rpx solid #F5F5F5; + border-radius: 16rpx; &-one { - width: 384rpx; - height: 150rpx; - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 40rpx; - color: #FFFFFF; - margin-right: -40rpx; - padding: 60rpx 0 0 80rpx; + width: 342rpx; + height: 92rpx; + font-weight: 500; + font-size: 24rpx; + display: flex; + align-items: center; + justify-content: center; + color: #D8FD24; box-sizing: border-box; - text-shadow: #894DD3 1rpx 0 0, #894DD3 0 1rpx 0, #894DD3 -1rpx 0 0, #894DD3 0 -1rpx 0; background: url($imgurl+'index/lianjiBtn1.png') no-repeat 0 0 / 100% 100%; } + &-one2 { + width: 342rpx; + height: 92rpx; + font-weight: 500; + font-size: 24rpx; + display: flex; + align-items: center; + justify-content: center; + color: #333333; + box-sizing: border-box; + } + &-lianji { position: absolute; - bottom: -25rpx; + // bottom: -25rpx; left: 50%; transform: translateX(-50%); - width: 174rpx; - height: 174rpx; + width: 118.79rpx; + height: 118.79rpx; z-index: 4; line-height: 1; background: url($imgurl+'index/lianjiMax.png') no-repeat 0 0 / 100% 100%; @@ -1593,19 +1691,31 @@ } &-two { - width: 384rpx; - height: 150rpx; - font-family: YouSheBiaoTiHei; - font-weight: 400; - font-size: 40rpx; - color: #FFFFFF; - margin-left: -40rpx; - padding: 60rpx 40rpx 0 0; + width: 342rpx; + height: 92rpx; + font-weight: 500; + font-size: 24rpx; + color: #D8FD24; + display: flex; + align-items: center; + justify-content: center; box-sizing: border-box; text-align: right; - text-shadow: #0CA0B9 1rpx 0 0, #0CA0B9 0 1rpx 0, #0CA0B9 -1rpx 0 0, #0CA0B9 0 -1rpx 0; background: url($imgurl+'index/duoquBtn1.png') no-repeat 0 0 / 100% 100%; } + + &-two2 { + width: 342rpx; + height: 92rpx; + font-weight: 500; + font-size: 24rpx; + color: #333333; + display: flex; + align-items: center; + justify-content: center; + box-sizing: border-box; + text-align: right; + } } } @@ -1799,49 +1909,41 @@ .buy-pop { padding: 0 30rpx; box-sizing: border-box; - background: #1C1B20; + background: #F7F7F7; padding-bottom: 30rpx; + border-radius: 16rpx 16rpx 0rpx 0rpx; - &::after { - content: ''; - position: absolute; - top: -62rpx; - left: 0; - width: 750rpx; - height: 62rpx; - background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%; - } .buy-pop-hd { - padding: 20rpx 0; + padding: 40rpx 0; padding-left: 10rpx; display: flex; justify-content: space-between; align-items: center; >text { - font-size: 32rpx; + font-size: 28rpx; font-weight: 500; - color: #ffffff; + color: #333333; } .close { - width: 60rpx; - height: 60rpx; + width: 24rpx; + height: 24rpx; } } .buy-card { border-radius: 20rpx; - padding: 30rpx 30rpx 10rpx; - background: #5B5B5D; + padding: 30rpx; + background: #FFFFFF; .buy-info { display: flex; .pic { - width: 190rpx; - height: 190rpx; + width: 180rpx; + height: 180rpx; border-radius: 10rpx; } @@ -1851,22 +1953,20 @@ display: flex; flex-flow: column nowrap; justify-content: space-between; - padding: 10rpx 0 10rpx 30rpx; + padding: 32rpx 0 10rpx 30rpx; .title { - font-size: 32rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #ffffff; + font-size: 24rpx; + font-weight: 500; + color: #333333; } .hang1 {} .type { - font-size: 28rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #dddddd; + font-size: 20rpx; + font-weight: 500; + color: #999999; } .price-num { @@ -1876,15 +1976,19 @@ .price { ffont-weight: 500; - font-size: 24rpx; - color: #F6C0FF; + font-size: 16rpx; + color: #333333; + + >text { + font-size: 28rpx; + } + } .num { - font-size: 28rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #ffffff; + font-size: 20rpx; + font-weight: 500; + color: #999999; } } } @@ -1946,6 +2050,43 @@ } } + .card-row { + padding: 24rpx; + display: flex; + justify-content: space-between; + align-items: center; + background-color: #FFFFFF; + margin-top: 24rpx; + border-radius: 16rpx; + + .title { + >image { + width: 32rpx; + height: 32rpx; + } + + >text { + font-weight: 500; + font-size: 24rpx; + color: #333333; + } + } + + .row-r { + display: flex; + align-items: center; + font-size: 20rpx; + font-weight: 500; + color: #999999; + + .icon { + width: 10rpx; + height: 17.14rpx; + margin-left: 10rpx; + } + } + } + .pay-title { margin-top: 30rpx; font-size: 38rpx; @@ -1954,11 +2095,12 @@ } .pay-type { - padding: 30rpx; + padding: 24rpx; border-radius: 20rpx; display: flex; align-items: center; + .icon { width: 32rpx; height: 32rpx; @@ -1966,22 +2108,18 @@ .title { flex: 1; - padding: 0 20rpx; - font-size: 28rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #ffffff; + font-size: 24rpx; + font-weight: 500; + color: #333333; } } .agree { display: flex; margin-top: 30rpx; - - font-size: 24rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #ffffff; + font-size: 20rpx; + font-weight: 500; + color: #999999; line-height: 32rpx; .icon { @@ -1993,39 +2131,36 @@ .rule { padding: 20rpx; - background: #5B5B5D; + background: #F9F8E1; border-radius: 20rpx; box-sizing: border-box; margin: 20rpx 0 0; .rule-inner { max-height: 160rpx; - font-size: 20rpx; - font-family: Source Han Sans CN; - font-weight: 400; - color: #ffffff; + font-weight: 500; + color: #333333; } } .pay-btn { - margin: 30rpx auto 0; - width: 406rpx; - height: 116rpx; + margin: 30rpx auto; + width: 686rpx; + height: 84rpx; background: url($imgurl+'common/payBtn.png') no-repeat 0 0 / 100% 100%; display: flex; + align-items: center; justify-content: center; font-weight: 500; - color: #7825DE; + color: #CDEF27; >text:nth-child(1) { - font-size: 28rpx; - margin-top: 32rpx; + font-size: 24rpx; } >text:nth-child(2) { - font-size: 36rpx; - margin-top: 26rpx; + font-size: 24rpx; } } } diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue index 4f8f8ac..3b652ad 100644 --- a/pages/shouye/detail.vue +++ b/pages/shouye/detail.vue @@ -48,6 +48,10 @@ + + + \ No newline at end of file diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue index 2f71bfd..ca5e78c 100644 --- a/pages/shouye/detail_wuxian.vue +++ b/pages/shouye/detail_wuxian.vue @@ -51,6 +51,10 @@ 收藏 + + + @@ -128,7 +132,7 @@