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..754f485 100644
--- a/components/ymf-components/ymf-share-popup.vue
+++ b/components/ymf-components/ymf-share-popup.vue
@@ -110,11 +110,11 @@
}).then(res => {
// console.log('分享组件挂载完毕:shareConfig',res);
// console.log('分享组件挂载完毕:currentOptions',currentOptions);
- if(res){
+ if(res&& typeof res==='object'){
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/index.vue b/distribution/index.vue
index 6753150..16464ae 100644
--- a/distribution/index.vue
+++ b/distribution/index.vue
@@ -2,7 +2,7 @@
@@ -102,7 +102,7 @@
-
+
diff --git a/distribution/shop-detail/components/share-popup.vue b/distribution/shop-detail/components/share-popup.vue
index c828f94..d0addfc 100644
--- a/distribution/shop-detail/components/share-popup.vue
+++ b/distribution/shop-detail/components/share-popup.vue
@@ -3,7 +3,8 @@
qrcodeResult(e)">
-
+
@@ -25,12 +26,15 @@
ref="wQrcode"
@generate="(e) => qrcodeResult(e)"
> -->
-
+
+
@@ -38,223 +42,252 @@
+
+ .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 abfc25b..495cc2b 100644
--- a/distribution/shop-detail/index.vue
+++ b/distribution/shop-detail/index.vue
@@ -1,6 +1,6 @@
-
+
@@ -10,10 +10,10 @@
{{ state.shopName }}
-
+
上级:{{ state.parentName }}{{ state.parentPhone }}
-
+
绑定上级
@@ -409,7 +409,7 @@
});
}
- const shopUserInfo = ref();
+ const shopUserInfo = ref({shopInfo:{}});
const config = reactive({});
//邀请码
const inviteCode = ref('');
@@ -508,7 +508,7 @@
totalPage: 0
});
async function getRecoders() {
- if (state.config) return;
+ // if (state.config) return;
const ajaxQuery = {
...query,
shopId: options.shopId
@@ -571,6 +571,9 @@
const showInviteCode = computed(() => {
if (config.upgradeType == 'invite') {
+ if(config.openType=='pay'&&!isActivated.value){
+ return false
+ }
return true;
}
if (config.openType == 'manual' && (!state.distributionUser || !state.distributionUser.level)) {
@@ -585,12 +588,13 @@
if (!state.distributionUser && config.openType == 'manual') {
return true;
}
+
return false;
});
//是否已成为分销员
const isActivated = computed(() => {
- return state.distributionUser && state.distributionUser.level;
+ return (state.distributionUser && state.distributionUser.level)?true:false;
});
watch(
() => activeTab.value,
@@ -886,6 +890,10 @@
color: #e8ad7b;
line-height: 48rpx;
text-align: center;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
}
.bottom-btn {
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/pages.json b/pages.json
index e07fc7c..a431deb 100644
--- a/pages.json
+++ b/pages.json
@@ -258,7 +258,7 @@
"pages": [{
"path": "index",
"style": {
- "navigationBarTitleText": "分销中心",
+ "navigationBarTitleText": "全民股东",
"navigationStyle": "custom"
}
},
@@ -278,7 +278,7 @@
{
"path": "shop-detail/index",
"style": {
- "navigationBarTitleText": "分销中心",
+ "navigationBarTitleText": "全民股东",
"navigationStyle": "custom"
}
},
diff --git a/pages/product/index.vue b/pages/product/index.vue
index b1a6dc4..d49b196 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -192,7 +192,7 @@
-
+
@@ -2504,7 +2504,7 @@
console.log('options.initMessage', options.initMessage)
const newTableCode = userStore.getQueryString(res.result, 'code');
-
+ console.log('newTableCode',newTableCode);
const shopInfoRes = await APIproductqueryShop({
tableCode: newTableCode
});
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 73fb5e8..5619707 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -232,7 +232,7 @@ const myFunList = ref([
icon: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png'
},
{
- name: '分销',
+ name: '全民股东',
type: 'fenxiao',
icon: '/static/icon/fenxiao.svg'
},
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