From 6e2161fc5ea628560e7a72172b9641d779cd6d49 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 2 Feb 2026 09:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=94=80=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=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 +-
 distribution/index.vue                        |   2 +-
 .../shop-detail/components/share-popup.vue    | 435 ++++++++++--------
 distribution/shop-detail/index.vue            |  14 +-
 pages.json                                    |   4 +-
 pages/product/index.vue                       |   2 +-
 pages/user/user.vue                           |   2 +-
 7 files changed, 249 insertions(+), 212 deletions(-)

diff --git a/common/config.js b/common/config.js
index 41cc002..1273981 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 = false; // false线上 true本地
+const debug = true; // false线上 true本地
 let baseUrl = ''
 let baseUrlwws = ''
 
diff --git a/distribution/index.vue b/distribution/index.vue
index aeee5d0..16464ae 100644
--- a/distribution/index.vue
+++ b/distribution/index.vue
@@ -2,7 +2,7 @@
   <view>
     <up-navbar
       bg-color="transparent"
-      title="分销中心"
+      title="全民股东"
       @leftClick="back"
       :fixed="true"
     ></up-navbar>
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 @@
 		<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,223 +42,252 @@
 </template>
 
 <script setup>
-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 { ref, onMounted, nextTick } from 'vue';
+	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 {
+		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)}`;
-		console.log('codeOptions.value', codeOptions.value);
-	}, 500);
-});
+	onMounted(async () => {
+		setTimeout(async () => {
+			await nextTick();
+			const query = await returnQuery();
+			codeOptions.value.code =
+			`https://cashier.sxczgkj.com/invite?${removeQAndAfter(query)}`;
+			console.log('codeOptions.value', codeOptions.value);
+		}, 500);
+	});
 
-/** 
- * 截取字符串，移除 &q 及后面的所有内容
- * @param {string} str - 原始字符串
- * @returns {string} 处理后的字符串
- */
-function removeQAndAfter(str) {
-	// 检查是否为空字符串
-	if (!str || typeof str !== 'string') {
-		return str || '';
+	/** 
+	 * 截取字符串，移除 &q 及后面的所有内容
+	 * @param {string} str - 原始字符串
+	 * @returns {string} 处理后的字符串
+	 */
+	function removeQAndAfter(str) {
+		// 检查是否为空字符串
+		if (!str || typeof str !== 'string') {
+			return str || '';
+		}
+
+		// 找到 &q 的起始位置
+		const qIndex = str.indexOf('&q');
+
+		// 如果找到 &q，截取前面的部分；否则返回原字符串
+		return qIndex !== -1 ? str.slice(0, qIndex) : str;
 	}
 
-	// 找到 &q 的起始位置
-	const qIndex = str.indexOf('&q');
-
-	// 如果找到 &q，截取前面的部分；否则返回原字符串
-	return qIndex !== -1 ? str.slice(0, qIndex) : str;
-}
-
-const props = defineProps({
-	inviteCode: {
-		type: String,
-		default: ''
-	},
-	shopUserInfo: {
-		type: Object,
-		default: () => {}
-	}
-});
-
-const codeOptions = ref({
-	padding: 10,
-	size: 200,
-	code: ''
-});
-
-function copyCode() {
-	uni.setClipboardData({
-		data: props.inviteCode,
-		success: function () {
-			console.log('success');
+	const props = defineProps({
+		inviteCode: {
+			type: String,
+			default: ''
+		},
+		shopUserInfo: {
+			type: Object,
+			default: () => {}
 		}
 	});
-}
-const code = ref('');
 
-function qrcodeResult(e) {
-	console.log('qrcodeResult', e);
-	code.value = e.img.tempFilePath;
-	console.log('code', code.value);
-}
+	const codeOptions = ref({
+		padding: 10,
+		size: 200,
+		code: ''
+	});
 
-const show = defineModel({
-	type: Boolean,
-	default: false
-});
-const emits = defineEmits(['cancel', 'confirm']);
-function close() {
-	show.value = false;
-	emits('cancel');
-}
-function save() {
-	show.value = false;
+	function copyCode() {
+		uni.setClipboardData({
+			data: props.inviteCode,
+			success: function() {
+				console.log('success');
+			}
+		});
+	}
+	const code = ref('');
 
-	// 保存图片到相册
-	uni.saveImageToPhotosAlbum({
-		filePath: code.value,
-		success: function () {
-			uni.showToast({
-				title: '保存成功',
-				icon: 'none'
-			});
-		},
-		fail: function (err) {
-			console.log('保存失败原因：', err);
-			// 判断是否为授权拒绝（微信小程序授权拒绝的特征）
-			if (err.errMsg.includes('auth deny') || err.errMsg.includes('authorize fail')) {
-				// 弹出提示引导用户去设置页开启授权
-				uni.showModal({
-					title: '授权提示',
-					content: '保存图片需要授权访问相册，请前往设置开启授权',
-					showCancel: true,
-					cancelText: '取消',
-					confirmText: '去设置',
-					success: function (res) {
-						if (res.confirm) {
-							// 跳转到微信小程序的授权设置页
-							uni.openSetting({
-								success: function (settingRes) {
-									// 检查用户是否开启了相册授权
-									if (settingRes.authSetting['scope.writePhotosAlbum']) {
+	function qrcodeResult(e) {
+		console.log('qrcodeResult', e);
+		code.value = e.img.tempFilePath;
+		console.log('code', code.value);
+	}
+
+	const show = defineModel({
+		type: Boolean,
+		default: false
+	});
+	const emits = defineEmits(['cancel', 'confirm']);
+
+	function close() {
+		show.value = false;
+		emits('cancel');
+	}
+
+	function save() {
+		show.value = false;
+
+		// 保存图片到相册
+		uni.saveImageToPhotosAlbum({
+			filePath: code.value,
+			success: function() {
+				uni.showToast({
+					title: '保存成功',
+					icon: 'none'
+				});
+			},
+			fail: function(err) {
+				console.log('保存失败原因：', err);
+				// 判断是否为授权拒绝（微信小程序授权拒绝的特征）
+				if (err.errMsg.includes('auth deny') || err.errMsg.includes('authorize fail')) {
+					// 弹出提示引导用户去设置页开启授权
+					uni.showModal({
+						title: '授权提示',
+						content: '保存图片需要授权访问相册，请前往设置开启授权',
+						showCancel: true,
+						cancelText: '取消',
+						confirmText: '去设置',
+						success: function(res) {
+							if (res.confirm) {
+								// 跳转到微信小程序的授权设置页
+								uni.openSetting({
+									success: function(settingRes) {
+										// 检查用户是否开启了相册授权
+										if (settingRes.authSetting[
+												'scope.writePhotosAlbum']) {
+											uni.showToast({
+												title: '授权成功，可重新保存',
+												icon: 'none'
+											});
+										} else {
+											uni.showToast({
+												title: '未开启授权，保存失败',
+												icon: 'none'
+											});
+										}
+									},
+									fail: function() {
 										uni.showToast({
-											title: '授权成功，可重新保存',
-											icon: 'none'
-										});
-									} else {
-										uni.showToast({
-											title: '未开启授权，保存失败',
+											title: '打开设置失败',
 											icon: 'none'
 										});
 									}
-								},
-								fail: function () {
-									uni.showToast({
-										title: '打开设置失败',
-										icon: 'none'
-									});
-								}
-							});
+								});
+							}
 						}
-					}
-				});
-			} else {
-				// 非授权问题的保存失败（如文件路径错误、系统问题等）
-				uni.showToast({
-					title: '保存失败',
-					icon: 'none'
-				});
+					});
+				} else {
+					// 非授权问题的保存失败（如文件路径错误、系统问题等）
+					uni.showToast({
+						title: '保存失败',
+						icon: 'none'
+					});
+				}
 			}
-		}
-	});
+		});
 
-	emits('confirm', code.value);
-}
+		emits('confirm', code.value);
+	}
 </script>
 
 <style lang="scss" scoped>
-: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;
+	:deep(.info .canvas) {
+		opacity: 1;
 	}
-	.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;
+	.border {
+		border: 2rpx solid #d9d9d9;
+		padding: 18rpx;
+		border-radius: 4rpx;
 	}
-}
-.line-height-54 {
-	line-height: 54rpx;
-}
-.w-qrcode {
-	position: fixed;
-	left: -9999px;
-	top: -9999px;
-	z-index: -1;
-}
-</style>
+
+	.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;
+	}
+</style>
\ 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 @@
 <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>
@@ -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,
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 25868c4..d49b196 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -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'
 	},