diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue index 9be2e5b..2422e02 100644 --- a/package/index/lian-ji.vue +++ b/package/index/lian-ji.vue @@ -76,7 +76,9 @@ 规则 - + + 收藏 @@ -164,7 +166,8 @@ 连击MAX 连击 {{buyNum}} 次 - {{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝 + {{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝 + - + + {{buyNum}} + + + + + + + + + + + + {{pageData.goods?pageData.goods.user_lian_ji_number:0}}/{{pageData.goods?pageData.goods.lian_ji_num:0}} + + + + 连击{{ pageTabCur==0?buyNum:0}}次 @@ -249,21 +275,21 @@ {{ previewData.shang_title }} - + {{ previewData.title }} - + {{ previewData.shang_title }} {{ previewData.pro }} - + 产品类型:{{ optData.type_text }} - + @@ -368,7 +394,7 @@ - + @@ -805,7 +831,7 @@ num, size }) { - if(num>1) return this.mescroll.endByPage(this.logList.length, 1) + if (num > 1) return this.mescroll.endByPage(this.logList.length, 1) this.req({ url: 'infinite_shang_log', data: { @@ -874,7 +900,16 @@ open(e) { this.$refs[e].open() + }, + + + computedPercentage(numerator, denominator) { + // 确保分母不为0,以避免除以零的错误 + if (this.denominator === 0) return 0; + // 计算百分比并乘以100(如果需要百分比形式的输出) + return (numerator / denominator) * 100; } + } } @@ -1189,9 +1224,9 @@ } .goods-list { - padding: 30rpx 0rpx 0; + padding: 30rpx 10rpx 10rpx 10rpx; display: grid; - grid-template-columns: repeat(4,220rpx); + grid-template-columns: repeat(3, 220rpx); grid-gap: 20rpx; .goods-item { @@ -1647,40 +1682,46 @@ width: 750rpx; display: flex; justify-content: space-evenly; - + .ft-btn { width: 244rpx; height: 116rpx; font-weight: 400; font-size: 28rpx; - >text{ + + >text { margin-top: 36rpx; } } - >view:nth-child(1){ + + >view:nth-child(1) { color: #DE6025; } - >view:nth-child(2){ + + >view:nth-child(2) { color: #7825DE; } } } + .d-pop { position: relative; width: 570rpx; box-sizing: border-box; - + .pic { width: 570rpx; height: 598rpx; // background: #8953DC; background: #FFFFFF; border: 2rpx solid #FFFFFF; - >image{ + + >image { width: 548rpx; height: 549rpx; } - >view{ + + >view { width: 130rpx; height: 46rpx; position: absolute; @@ -1693,7 +1734,7 @@ background: url($imgurl+'common/chouLabel.png') no-repeat 0 0 / 100% 100%; } } - + .title { margin: 40rpx auto 0; width: 574rpx; @@ -1707,30 +1748,30 @@ border: 2rpx solid #894DD3; border-radius: 12rpx; background: #313133; - + >text { font-weight: 400; font-size: 32rpx; color: #FFFFFF; } } - + .d-list { display: flex; flex-flow: row wrap; justify-content: space-between; padding: 20rpx 0 0; - + .d-item { margin-top: 14rpx; - + font-size: 24rpx; font-family: Source Han Sans CN; font-weight: 400; color: #ffffff; } } - + .close { width: 48rpx; height: 48rpx; diff --git a/pages/mall/index.vue b/pages/mall/index.vue index b388ba2..dda9dd5 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -5,14 +5,16 @@ 商城好物 - + - - + + {{item.title}} @@ -188,7 +190,9 @@ url: 'goods', data: { type: '10', - page: 1 + page: 1, + use_money_is: this.useMoney ? 1 : 2, + use_integral_is: this.isWXPay ? 1 : 2, }, success(res) { that.datas = res.data.data @@ -207,8 +211,8 @@ prize_num: 1, goods_id: data.id, goods_num: 1, - // use_money_is: that.yue ? 1 : 2, - // use_integral_is: that.bi ? 1 : 2, + use_money_is: this.useMoney ? 1 : 2, + use_integral_is: this.isWXPay ? 1 : 2, // coupon_id: (that.couponData && that.couponData.id) || '' }, success(res) { @@ -342,7 +346,7 @@ margin: 33rpx; padding-bottom: 200rpx; grid-template-columns: repeat(2, 1fr); - gap: 10px; + gap: 16px; } .grid-item { @@ -436,7 +440,7 @@ .buy-card { border-radius: 20rpx; - padding: 30rpx 30rpx 10rpx; + padding: 30rpx 30rpx 30rpx 30rpx; background: #5B5B5D; .buy-info { @@ -454,7 +458,7 @@ display: flex; flex-flow: column nowrap; justify-content: space-between; - padding: 10rpx 0 10rpx 30rpx; + padding: 10rpx 10rpx 10rpx 30rpx; .title { font-size: 32rpx; diff --git a/static/common/banner.png b/static/common/banner.png deleted file mode 100644 index 6f8acb9..0000000 Binary files a/static/common/banner.png and /dev/null differ diff --git a/static/common/goods_bj.png b/static/common/goods_bj.png deleted file mode 100644 index b8c546d..0000000 Binary files a/static/common/goods_bj.png and /dev/null differ diff --git a/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js b/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js index 3bfdac1..23cdafa 100644 --- a/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js +++ b/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js @@ -6,7 +6,7 @@ export default function MeScroll(options, isScrollBody) { let me = this; - me.version = '1.3.7'; // mescroll版本号 + me.version = '1.3.8'; // mescroll版本号 me.options = options || {}; // 配置 me.isScrollBody = isScrollBody || false; // 滚动区域是否为原生页面滚动; 默认为scroll-view