修复分销回显问题，修复部分问题

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: {

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)&&currentOptions.fromUserId&&res.isSharedUserPopup){
+				if( pTag&&rewardSharePages.includes(pTag)&&currentOptions.fromUserId&&res.isSharedUserPopup&&res.isEnabled){
 					show.value=true
 				}
 				// if(res.sharedUserCouponId&&res.sharedUserCouponNum){

distribution/index.vue

@@ -2,7 +2,7 @@
   <view>
     <up-navbar
       bg-color="transparent"
-      title="分销中心"
+      title="全民股东"
       @leftClick="back"
       :fixed="true"
     ></up-navbar>
@@ -102,7 +102,7 @@
           </view>
         </view>
         <view
-          v-if="state.activates.totalRow > 0"
+          v-if="state.activates.totalRow*1 > 0"
           class="u-flex justify-center font-12 color-666"
           style="align-items: baseline"
           @click="toShopList('activates')"
@@ -159,7 +159,7 @@
           </view>
         </view>
         <view
-          v-if="state.activates.totalRow > 0"
+          v-if="state.unActivates.totalRow*1 > 0"
           class="u-flex justify-center font-12 color-666"
           style="align-items: baseline"
           @click="toShopList('unActivates')"

distribution/shop-detail/components/bind-shangji.vue

@@ -19,7 +19,7 @@
             <view class="u-m-l-32 u-flex-1 border">
               <input placeholder="请输入上级邀请码" v-model="code" />
             </view>
-            <image src="/distribution/static/scan.svg" class="u-m-l-10" style="width: 60rpx; height: 60rpx;" @click="saoma"></image>
+            <!-- <image src="/distribution/static/scan.svg" class="u-m-l-10" style="width: 60rpx; height: 60rpx;" @click="saoma"></image> -->
           </view>
 
           <view class="u-m-t-32 u-flex u-col-center" style="gap: 54rpx">

distribution/shop-detail/components/share-popup.vue

@@ -3,7 +3,8 @@
 		<view class="w-qrcode">
 			<w-qrcode :options="codeOptions" :opacity="0" ref="wQrcode" @generate="(e) => qrcodeResult(e)"></w-qrcode>
 		</view>
-		<up-popup :show="show" bgColor="transparent" :safeAreaInsetBottom="false" :closeOnClickOverlay="true" @close="close" mode="center">
+		<up-popup :duration="0" :show="show" bgColor="transparent" :safeAreaInsetBottom="false"
+			:closeOnClickOverlay="true" @close="close" mode="center">
 			<view class="box">
 				<view class="info">
 					<view class="u-flex justify-center">
@@ -25,12 +26,15 @@
               ref="wQrcode"
               @generate="(e) => qrcodeResult(e)"
             ></w-qrcode> -->
-						<up-image width="322rpx" height="322rpx" :src="code"></up-image>
+						<image :src="code" class="code"></image>
+						<!-- <up-image width="322rpx" mode="scaleToFill" height="322rpx" :src="code"></up-image> -->
 					</view>
 				</view>
 				<view class="footer-wrap">
 					<view class="confirm line" @click="save">保存图片</view>
-					<ymf-share><view class="confirm">微信分享</view></ymf-share>
+					<ymf-share>
+						<view class="confirm">微信分享</view>
+					</ymf-share>
 				</view>
 			</view>
 		</up-popup>
@@ -38,17 +42,28 @@
 </template>
 
 <script setup>
-import { shareMixin, handleMixinOnLoad, returnQuery } from '@/utils/share.js';
+	import {
+		shareMixin,
+		handleMixinOnLoad,
+		returnQuery
+	} from '@/utils/share.js';
 	import ymfShare from '@/components/ymf-components/ymf-share.vue';
 	import wQrcode from '@/uni_modules/wmf-code/components/w-qrcode/w-qrcode.vue';
-import { desensitizePhone } from '@/utils/util.js';
+	import {
-import { ref, onMounted, nextTick } from 'vue';
+		desensitizePhone
+	} from '@/utils/util.js';
+	import {
+		ref,
+		onMounted,
+		nextTick
+	} from 'vue';
 
 	onMounted(async () => {
 		setTimeout(async () => {
 			await nextTick();
 			const query = await returnQuery();
-		codeOptions.value.code = `https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`;
+			codeOptions.value.code =
+			`https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`;
 			console.log('codeOptions.value', codeOptions.value);
 		}, 500);
 	});
@@ -109,10 +124,12 @@ const show = defineModel({
 		default: false
 	});
 	const emits = defineEmits(['cancel', 'confirm']);
+
 	function close() {
 		show.value = false;
 		emits('cancel');
 	}
+
 	function save() {
 		show.value = false;
 
@@ -142,7 +159,8 @@ function save() {
 								uni.openSetting({
 									success: function(settingRes) {
 										// 检查用户是否开启了相册授权
-									if (settingRes.authSetting['scope.writePhotosAlbum']) {
+										if (settingRes.authSetting[
+												'scope.writePhotosAlbum']) {
 											uni.showToast({
 												title: '授权成功，可重新保存',
 												icon: 'none'
@@ -182,33 +200,40 @@ function save() {
 	:deep(.info .canvas) {
 		opacity: 1;
 	}
+
 	.border {
 		border: 2rpx solid #d9d9d9;
 		padding: 18rpx;
 		border-radius: 4rpx;
 	}
+
 	.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;
@@ -229,6 +254,7 @@ function save() {
 		white-space: nowrap;
 		line-height: 48rpx;
 	}
+
 	.confirm {
 		$color: #e8ad7b;
 		flex: 1;
@@ -243,18 +269,25 @@ function save() {
 		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;
+	}
 </style>

distribution/shop-detail/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="min-h-100vh bg-gray">
-		<up-navbar bg-color="transparent" title="分销中心" @leftClick="back" :fixed="true"></up-navbar>
+		<up-navbar bg-color="transparent" title="全民股东" @leftClick="back" :fixed="true"></up-navbar>
 		<view class="top">
 			<image class="top_bg" src="/distribution/static/top_bg.png" :style="imageStyle"></image>
 			<view class="box" :class="{ type1: isActivated }">
@@ -10,10 +10,10 @@
 						<text class="u-m-l-14 font-14 color-333 font-700">{{ state.shopName }}</text>
 					</view>
 					<view>
-						<template v-if="state.parentPhone">
+						<template v-if="state.parentPhone||state.parentName ">
 							<view class="font-12 color-666">上级：{{ state.parentName }}{{ state.parentPhone }}</view>
 						</template>
-						<template v-if="!state.parentPhone">
+						<template v-else>
 							<view class="bind" @click="showBindShangji = true">绑定上级</view>
 						</template>
 					</view>
@@ -221,7 +221,7 @@
 		<commissionPopup :tipsType="commissionTipsType" v-model="showCommission" :config="config"
 			:levelConfigList="config.levelConfigList || []"></commissionPopup>
 		<rulePopup v-model="showRule" :config="config" :distributionUser="state.distributionUser"></rulePopup>
-		<popupDistributionGroupCode :group="state.group" v-model="showGroup"></popupDistributionGroupCode>
+		<popupDistributionGroupCode :group="state.group" v-model="showGroup" v-model:shopInfo="shopUserInfo.shopInfo"></popupDistributionGroupCode>
 		<ymf-share-popup ></ymf-share-popup>
 	</view>
 </template>
@@ -400,7 +400,7 @@
 		});
 	}
 
-	const shopUserInfo = ref();
+	const shopUserInfo = ref({shopInfo:{}});
 	const config = reactive({});
 	//邀请码
 	const inviteCode = ref('');
@@ -499,7 +499,7 @@
 		totalPage: 0
 	});
 	async function getRecoders() {
-		if (state.config) return;
+		// if (state.config) return;
 		const ajaxQuery = {
 			...query,
 			shopId: options.shopId
@@ -562,6 +562,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)) {
@@ -576,12 +579,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,
@@ -871,6 +875,10 @@
 		color: #e8ad7b;
 		line-height: 48rpx;
 		text-align: center;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 	}
 
 	.bottom-btn {

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"
 					}
 				},

pages/product/index.vue

@@ -192,7 +192,7 @@
 					</scroll-view>
 				</view>
 				<view class="main">
-					<view class="u-p-r-32">
+					<view class="u-p-r-32" v-if="carouselList.length">
 						<up-swiper indicator indicatorMode="line" height="188rpx" :list="carouselList"
 							keyName="imageUrl">
 							<template #default="scope">
@@ -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
 					});

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'
 	},