From 13ae818fd48b9bdbda286deb14a6f91fb5a4eb36 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Mon, 26 Jan 2026 16:02:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=BA=93=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 2f533b6..9245e02 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "lodash": "^4.17.21", "pinia": "^2.3.1", "pinia-plugin-unistorage": "^0.1.2", - "ysk-utils": "^1.0.83" + "ysk-utils": "^1.0.85" }, "devDependencies": { "unplugin-auto-import": "^0.16.7" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 99806e8..b898ee3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: ^0.1.2 version: 0.1.2 ysk-utils: - specifier: ^1.0.83 - version: 1.0.83 + specifier: ^1.0.85 + version: 1.0.85 devDependencies: unplugin-auto-import: specifier: ^0.16.7 @@ -50,13 +50,13 @@ packages: resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==} engines: {node: '>=6.9.0'} - '@babel/parser@7.28.5': - resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==} + '@babel/parser@7.28.6': + resolution: {integrity: sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==} engines: {node: '>=6.0.0'} hasBin: true - '@babel/types@7.28.5': - resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==} + '@babel/types@7.28.6': + resolution: {integrity: sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==} engines: {node: '>=6.9.0'} '@dcloudio/types@3.4.21': @@ -357,8 +357,8 @@ packages: webpack-virtual-modules@0.6.2: resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==} - ysk-utils@1.0.83: - resolution: {integrity: sha512-48KLQJXQtF8nLaaFHR1hAFx/QGS848fg7n37BpZEtwliD+D5ZHQFPOCZNaM68jiwDTWhNg41rHpZzhAUQXe+/Q==} + ysk-utils@1.0.85: + resolution: {integrity: sha512-HkbV4Jidi3G6DAuGAN972tClUYtC2zVoxo4crrxexfn0rZa8HjXatUfEbawHOeEzyl6G1CdC+160I2bKfxEBlA==} snapshots: @@ -368,11 +368,11 @@ snapshots: '@babel/helper-validator-identifier@7.28.5': {} - '@babel/parser@7.28.5': + '@babel/parser@7.28.6': dependencies: - '@babel/types': 7.28.5 + '@babel/types': 7.28.6 - '@babel/types@7.28.5': + '@babel/types@7.28.6': dependencies: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 @@ -408,7 +408,7 @@ snapshots: '@vue/compiler-core@3.5.22': dependencies: - '@babel/parser': 7.28.5 + '@babel/parser': 7.28.6 '@vue/shared': 3.5.22 entities: 4.5.0 estree-walker: 2.0.2 @@ -421,7 +421,7 @@ snapshots: '@vue/compiler-sfc@3.5.22': dependencies: - '@babel/parser': 7.28.5 + '@babel/parser': 7.28.6 '@vue/compiler-core': 3.5.22 '@vue/compiler-dom': 3.5.22 '@vue/compiler-ssr': 3.5.22 @@ -684,7 +684,7 @@ snapshots: webpack-virtual-modules@0.6.2: {} - ysk-utils@1.0.83: + ysk-utils@1.0.85: dependencies: bignumber.js: 9.3.1 loadsh: 0.0.4 From ea3fb0fe0fd62c8459f3fab7ca1c21b5fdb74f41 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Sat, 31 Jan 2026 09:27:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/config.js | 2 +- components/popup-distribution-group-code.vue | 2 +- components/ymf-components/ymf-share-popup.vue | 2 +- distribution/shop-detail/index.vue | 2 +- pages/product/index.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/config.js b/common/config.js index 1273981..41cc002 100644 --- a/common/config.js +++ b/common/config.js @@ -1,6 +1,6 @@ // const debug = process.env.NODE_ENV == 'development' ? true : false; // const debug = false; // false线上 true本地 -const debug = true; // false线上 true本地 +const debug = false; // false线上 true本地 let baseUrl = '' let baseUrlwws = '' diff --git a/components/popup-distribution-group-code.vue b/components/popup-distribution-group-code.vue index 131124b..7e79c88 100644 --- a/components/popup-distribution-group-code.vue +++ b/components/popup-distribution-group-code.vue @@ -28,7 +28,7 @@ import { ref, onMounted } from 'vue'; import { centerConfig,distributionEditIn } from '@/common/api/market/distribution.js'; import { checkArrayElementsExist } from '@/utils/util.js'; -const shopInfo = ref(''); +const shopInfo = defineModel('shopInfo'); const props = defineProps({ type: { diff --git a/components/ymf-components/ymf-share-popup.vue b/components/ymf-components/ymf-share-popup.vue index 95d8b68..90c3dd0 100644 --- a/components/ymf-components/ymf-share-popup.vue +++ b/components/ymf-components/ymf-share-popup.vue @@ -114,7 +114,7 @@ Object.assign(config,res) const rewardSharePages=res.rewardSharePages.split(',') const pTag = returnPageTags(path) - if( pTag&&rewardSharePages.includes(pTag)&¤tOptions.fromUserId&&res.isSharedUserPopup){ + if( pTag&&rewardSharePages.includes(pTag)&¤tOptions.fromUserId&&res.isSharedUserPopup&&res.isEnabled){ show.value=true } // if(res.sharedUserCouponId&&res.sharedUserCouponNum){ diff --git a/distribution/shop-detail/index.vue b/distribution/shop-detail/index.vue index 5c61688..dad8a97 100644 --- a/distribution/shop-detail/index.vue +++ b/distribution/shop-detail/index.vue @@ -221,7 +221,7 @@ - + diff --git a/pages/product/index.vue b/pages/product/index.vue index b1a6dc4..25868c4 100644 --- a/pages/product/index.vue +++ b/pages/product/index.vue @@ -192,7 +192,7 @@ - + + + .box { + width: 638rpx; + background-color: #fff; + border-radius: 16rpx; + // overflow: hidden; + position: relative; + + .title { + color: #000000; + font-size: 32rpx; + font-weight: 700; + } + + .top { + border-bottom: 2rpx solid #ededed; + } + + .info { + padding: 96rpx 40rpx 96rpx 40rpx; + font-size: 28rpx; + } + + .small-title { + min-width: 84rpx; + text-align: right; + } + + .footer-wrap { + width: 100%; + position: absolute; + left: 0; + bottom: -100upx; + display: flex; + gap: 28upx; + } + } + + .cancel { + padding: 14rpx 76rpx; + border-radius: 36rpx; + border: 2rpx solid #e8ad7b; + color: #e8ad7b; + font-size: 32rpx; + font-weight: 400; + white-space: nowrap; + line-height: 48rpx; + } + + .confirm { + $color: #e8ad7b; + flex: 1; + padding: 14rpx 76rpx; + border-radius: 16rpx; + background-color: $color; + border: 2rpx solid $color; + color: #fff; + font-size: 32rpx; + font-weight: 400; + white-space: nowrap; + display: flex; + justify-content: center; + align-items: center; + + &.line { + background-color: #fff; + color: $color; + } + } + + .line-height-54 { + line-height: 54rpx; + } + + .w-qrcode { + position: fixed; + left: -9999px; + top: -9999px; + z-index: -1; + } + .code{ + width: 322rpx; + height: 322rpx; + } + \ No newline at end of file diff --git a/distribution/shop-detail/index.vue b/distribution/shop-detail/index.vue index 705182b..6d70c95 100644 --- a/distribution/shop-detail/index.vue +++ b/distribution/shop-detail/index.vue @@ -1,6 +1,6 @@