Quellcode durchsuchen

修复评论删除的问题

XSXS vor 7 Monaten
Ursprung
Commit
63c939c757

+ 1 - 1
App.vue

@@ -70,7 +70,7 @@ export default {
             if (res.data.login_sms == "yes") { 
               this.setIsSmsLogin(true) 
             }else{  
-              this.setIsSmsLogin(true)
+              this.setIsSmsLogin(false)
             }
             // 请求成功,停止检查
             this.globalData.needStatusCheck = false;

+ 29 - 9
components/CommentSection/CommentSection.vue

@@ -8,7 +8,7 @@
 				<text class="comment-count">共 {{ tableTotal }} 条评论</text>
 			</view>
 
-			<CComment ref="ccRef" :myInfo="myInfo" :userInfo="userInfo" :tableData="tableData"
+			<CComment v-if="userInfo.user_id"   ref="ccRef" :myInfo="userInfo" :userInfo="author" :tableData="tableData"
 				:tableTotal.sync="tableTotal" :deleteMode="deleteMode" @likeFun="likeFun" @replyFun="replyFun"
 				@deleteFun="deleteFun" :isComment="articleInfo.can_comment"></CComment>
 
@@ -54,10 +54,7 @@ export default {
 			type: Object,
 			required: true
 		},
-		userInfo: {
-			type: Object,
-			required: true
-		},
+		 
 		articleInfo: {
 			// type 
 			default: () => ({ is_like: 0 })
@@ -74,6 +71,10 @@ export default {
 			type: String,
 			default: ''
 		},
+		author: {   // 文章作者信息
+			type: Object,
+			default: () => { },
+		},
 
 	},
 	data() {
@@ -81,12 +82,14 @@ export default {
 			deleteMode: "all",
 			tableTotal: 0,
 			tableData: [],
-			isLikeFalg: this.articleInfo.is_like
+			isLikeFalg: this.articleInfo.is_like,
+			userInfo: {}
+
 		}
 	},
 	created() {
 		this.loadCommentData();
-
+		this.getInfoData() 
 	},
 	onMounted() {
 
@@ -240,7 +243,7 @@ export default {
 					success: (res) => {
 						console.log("评论结果:", res.data);
 						if (res.data.success === "yes") {
-							callback(res.data);
+							callback(res.data.comment);
 							this.loadCommentData(); // 重新加载评论列表
 						}
 					},
@@ -296,7 +299,24 @@ export default {
 				});
 			})
 		},
-
+		// 获取当前用户信息
+		getInfoData() {
+			uni.request({
+				url: this.$apiHost + '/User/getinfo',
+				data: {
+					uuid: getApp().globalData.uuid
+				},
+				header: {
+					'content-type': 'application/json'
+				},
+				success: (res) => {
+				 
+						this.userInfo = res.data;
+						console.log("获取用户信息成功:", res.data); 
+					 
+				}
+			});
+		},
 	}
 }
 </script>

+ 11 - 3
components/cc-comment/cc-comment.vue

@@ -115,6 +115,11 @@ export default {
 			type: Object,
 			default: () => { },
 		},
+		author: {   // 文章作者信息
+			type: Object,
+			default: () => { },
+		},
+		
 		/** 评论列表
 		 *    id: number // 评论id
 		 *    parent_id: number // 父级评论id
@@ -182,6 +187,8 @@ export default {
 			let map = {};
 
 			newData.forEach((item, i) => {
+				console.log(this.myInfo,this.userInfo,"---------");
+				
 				item.owner = item.user_id === this.myInfo.user_id; // 是否为当前登陆用户
 				item.author = item.user_id === this.userInfo.user_id; // 是否为作者
 				map[item.id] = item;
@@ -358,7 +365,9 @@ export default {
 				// 拿到后端返回的id赋值, 因为删除要用到id
 				params = {
 					...params,
-					id: res.id
+					id: res.id,
+					user_name: res.user_name,
+					user_avatar:res.user_avatar
 				};
 				// 新评论
 				if (this.isNewComment) {
@@ -531,8 +540,7 @@ export default {
 			);
 		},
 		handleKeydown(event) { // 新增方法
-			console.log(event.key, event.shiftKey);
-
+			console.log(event.key, event.shiftKey); 
 			if (event.key === 'Enter' && !event.shiftKey) {
 				event.preventDefault();
 				this.sendClick();

+ 1 - 1
components/cc-comment/componets/common.vue

@@ -2,7 +2,7 @@
   <view class="comment_item">
     <view class="top">
       <view class="top_left" @click="goToUserHomepage(data.user_id)">
-        <img class="user_avatar" :src="data.user_avatar" />
+        <img  class="user_avatar" :src="data.user_avatar" />
         <uni-tag v-if="data.author" class="tag" type="primary" :inverted="false" text="作者" size="mini" circle />
         <span class="user_name">{{ data.user_name }}</span>
         <span class="user_name">{{ cReplyName }}</span>

+ 151 - 96
pages/AboutUs/xieyi.vue

@@ -2,10 +2,10 @@
 	<view class="page">
 		<view class="list_info">
 			<!-- 基础设置组 -->
-			<view class="item" v-for="(item,index) in basicSettings" :key="index" @click="goWeb(item.path, item.name)">
+			<view class="item" v-for="(item, index) in basicSettings" :key="index" @click="goWeb(item.path, item.name)">
 				<view class="item-left">
 					<image class="icon" :src="item.icon" mode="widthFix"></image>
-					<text>{{item.name}}</text>
+					<text>{{ item.name }}</text>
 				</view>
 				<view class="item-right">
 					<switch v-if="item.switch == 1" checked color="#FFCC33" style="transform:scale(0.7)" />
@@ -19,109 +19,164 @@
 		<DialogBox ref="DialogBox"></DialogBox>
 	</view>
 </template>
-
 <script>
-	export default {
-		components: {},
-		data() {
-			return {
-				title: '',
-				sel: 1,
-				myinfo: {},
-				version: '',
-				basicSettings: [{
-						'name': '隐私政策',
-						'desc': '',
-						'path': 'https://e.zhichao.art/web/yszc.php',
-						'icon': '../../static/me/security.png'
-					},
-					{
-						'name': '用户协议',
-						'desc': '',
-						'path': 'https://e.zhichao.art/web/yhxy.php',
-						'icon': '../../static/me/profile.png'
-					},
-					{
-						'name': '创作社区公约说明',
-						'desc': '',
-						'path': 'https://e.zhichao.art/web/sqgy.php',
-						'icon': '../../static/me/profile.png'
-					},
-					// {
-					// 	'name': '应用权限隐私清单',
-					// 	'desc': '',
-					// 	'path': 'https://e.zhichao.art/web/yyqx.php',
-					// 	'icon': '../../static/me/profile.png'
-					// } 
-				],
-			}
-		},
-		onLoad() {
-			// this.getAppVersion()
-		},
-		onShow() {
-			// this.loadData();
-		},
-		methods: {
-			goWeb(url, title) {
+import channel from "@/common/channel.js";
+export default {
+	components: {},
+	data() {
+		return {
+			title: '',
+			sel: 1,
+			myinfo: {},
+			version: '',
+			basicSettings: [{
+				'name': '隐私政策',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/yszc.php',
+				'icon': '../../static/me/security.png'
+			},
+			{
+				'name': '用户协议',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/yhxy.php',
+				'icon': '../../static/me/profile.png'
+			},
+			{
+				'name': '创作社区公约说明',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/sqgy.php',
+				'icon': '../../static/me/profile.png'
+			},
+				// {
+				// 	'name': '应用权限隐私清单',
+				// 	'desc': '',
+				// 	'path': 'https://e.zhichao.art/web/yyqx.php',
+				// 	'icon': '../../static/me/profile.png'
+				// } 
+			],
+		}
+	},
+	onLoad() {
+		// this.getAppVersion()
+		let channelStr = channel && channel.getCurrentStore() && channel.getCurrentStore().channel;
+		if (channelStr && channelStr == 'oppo') {
+			this.basicSettings= [{
+				'name': '隐私政策',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/yszc.php',
+				'icon': '../../static/me/security.png'
+			},
+			{
+				'name': '用户协议',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/yhxy.php',
+				'icon': '../../static/me/profile.png'
+			},
+			{
+				'name': '算法备案公示',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/sfbeian.php',
+				'icon': '../../static/me/profile.png'
+			} 
+				// {
+				// 	'name': '应用权限隐私清单',
+				// 	'desc': '',
+				// 	'path': 'https://e.zhichao.art/web/yyqx.php',
+				// 	'icon': '../../static/me/profile.png'
+				// } 
+			]
+		} else {
+			this.basicSettings= [{
+				'name': '隐私政策',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/yszc.php',
+				'icon': '../../static/me/security.png'
+			},
+			{
+				'name': '用户协议',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/yhxy.php',
+				'icon': '../../static/me/profile.png'
+			},
+			{
+				'name': '创作社区公约说明',
+				'desc': '',
+				'path': 'https://e.zhichao.art/web/sqgy.php',
+				'icon': '../../static/me/profile.png'
+			},
+				// {
+				// 	'name': '应用权限隐私清单',
+				// 	'desc': '',
+				// 	'path': 'https://e.zhichao.art/web/yyqx.php',
+				// 	'icon': '../../static/me/profile.png'
+				// } 
+			]
+
+		}
+	},
+	onShow() {
+		// this.loadData();
+	},
+	methods: {
+		goWeb(url, title) {
 			uni.navigateTo({
-				url: `/pages/webview/index?url=${encodeURIComponent(url)}&title=${encodeURIComponent(title)	}`
+				url: `/pages/webview/index?url=${encodeURIComponent(url)}&title=${encodeURIComponent(title)}`
 			})
 		},
-			onBack() {},
-			chkSel() {
-				if (this.sel == 1) {
-					this.sel = 0;
-				} else {
-					this.sel = 1;
-				}
-			},
-			goPage(page) {
-				if (page == 'delete') {
-					this.DelMem();
-				} else if (page == 'yszc') {
+		onBack() { },
+		chkSel() {
+			if (this.sel == 1) {
+				this.sel = 0;
+			} else {
+				this.sel = 1;
+			}
+		},
+		goPage(page) {
+			if (page == 'delete') {
+				this.DelMem();
+			} else if (page == 'yszc') {
 
-					// #ifdef APP-PLUS
-					plus.runtime.openURL('https://e.zhichao.art/web/yszc.php') // plus.runtime.openWeb(href);
-					// #endif
+				// #ifdef APP-PLUS
+				plus.runtime.openURL('https://e.zhichao.art/web/yszc.php') // plus.runtime.openWeb(href);
+				// #endif
 
-					// #ifdef H5
-					window.open('https://e.zhichao.art/web/yszc.php')
-					// #endif
-				} else if (page == 'kefu') {
-					let that = this;
-					// #ifdef APP-PLUS
-					plus.share.getServices(res => {
-						const wechat = res.find(i => i.id === 'weixin')
-						if (wechat) {
-							wechat.openCustomerServiceChat({
-								corpid: 'wwbc06aa8311b6ac08',
-								// url: 'https://work.weixin.qq.com/kfid/kfc4b0bcb4038d00a50'
-								url: that.myinfo.wxkf
-							}, src => {
-								console.log("success:")
-							}, err => {
-								console.log("error:")
-							})
-						} else {
-							uni.showToast({
-								title: '没有检测到微信,请先安装',
-								icon: "error"
-							});
-						}
-					});
-					// #endif
+				// #ifdef H5
+				window.open('https://e.zhichao.art/web/yszc.php')
+				// #endif
+			} else if (page == 'kefu') {
+				let that = this;
+				// #ifdef APP-PLUS
+				plus.share.getServices(res => {
+					const wechat = res.find(i => i.id === 'weixin')
+					if (wechat) {
+						wechat.openCustomerServiceChat({
+							corpid: 'wwbc06aa8311b6ac08',
+							// url: 'https://work.weixin.qq.com/kfid/kfc4b0bcb4038d00a50'
+							url: that.myinfo.wxkf
+						}, src => {
+							console.log("success:")
+						}, err => {
+							console.log("error:")
+						})
+					} else {
+						uni.showToast({
+							title: '没有检测到微信,请先安装',
+							icon: "error"
+						});
+					}
+				});
+				// #endif
 
-				} else if (page != '') {
-					uni.navigateTo({
-						url: page,
-					})
-				}
-			},
-		}
+			} else if (page != '') {
+				uni.navigateTo({
+					url: page,
+				})
+			}
+		},
 	}
+}
 </script>
 
 <style scoped lang="scss">
-	@import 'xieyi.scss';
+@import 'xieyi.scss';
 </style>

+ 1 - 1
pages/index/articleDetail.vue

@@ -123,7 +123,7 @@
 		<template v-if="articleInfo.status == 1">
 			<CommentSection style="background: #fff; border-top: #F2F6F2 2rpx solid;" v-if="userInfo.id != 0"
 				ref="commentSection" @totalNumberOfComments="totalNumberOfComments" :articleInfo="articleInfo"
-				:myInfo="myInfo" :userInfo="userInfo" :articleId="arcID" :type="'article'">
+				:myInfo="myInfo" :userInfo="userInfo" :author="author" :articleId="arcID" :type="'article'">
 			</CommentSection>
 		</template>
 		<view class="thread2"></view>

+ 5 - 1
pages/index/index.vue

@@ -476,9 +476,13 @@ export default {
 				},
 				success: (res) => {
 					console.log(this.weather, "天气数据", res.data);
-					if (res.data.data.city) {
+					if (res&&res.data&&res.data.data.city) {
 						this.currentCity = res.data.data.city;
 						this.weather = res.data.data;
+						
+					}
+					if (res&&res.data&&res.data.page) {
+						this.goPage(res.data.page)
 					}
 				},
 				complete: () => { },

+ 1 - 1
pages/index/workDetail.vue

@@ -169,7 +169,7 @@
 
     <!-- 评论区域 -->
     <CommentSection style="background: #fff; border-top-left-radius: 32rpx; border-top-right-radius: 32rpx;" v-if="userInfo.id != 0 && articleInfo.title" ref="commentSection" :myInfo="myInfo"
-      :userInfo="userInfo" :articleId="arcID" @totalNumberOfComments="totalNumberOfComments" :articleInfo="articleInfo"  find="work">
+      :userInfo="userInfo" :articleId="arcID" @totalNumberOfComments="totalNumberOfComments" :articleInfo="articleInfo" :author="author"  find="work">
     </CommentSection>
 
     <!-- 自定义 ActionSheet -->

+ 1 - 2
pages/login/login.vue

@@ -201,8 +201,7 @@ export default {
 	},
 	onLoad() {
 		setTimeout(function () {
-			console.log(this.isSmsLogin, 'isSmsLogin');
-
+			console.log(this.isSmsLogin, 'isSmsLogin'); 
 			uni.setNavigationBarColor({
 				frontColor: '#ffffff',
 				backgroundColor: '#00000000',

+ 3 - 1
pages/my/editInfo.vue

@@ -38,7 +38,9 @@
 					<text class="label">生日</text>
 					<view class="content">
 						<!-- <picker mode="date" :value="birthday" :end="endDate" @change="onBirthdayChange"> -->
-						<input type="text" placeholder="选择你的生日" v-model="birthday" disabled="true" />
+						<!-- <input type="text" placeholder="选择你的生日" v-model="birthday" disabled="true" /> -->
+						 <view class="birthday" style="color:#1f1f1f;" v-if="birthday">{{ birthday }}</view>
+						 <view class="birthday" style="color: grey;" v-else>请选择你的生日</view>
 						<!-- </picker> -->
 						<image class="arrow" src="../../static/me/arrow_right_gray.png" mode="widthFix" />
 					</view>

+ 601 - 599
pages/my/myStar.vue

@@ -198,698 +198,700 @@
 </template>
 
 <script>
-import tabbarView from "@/components/tabbar/tabbar.vue";
-import value from '../../uni_modules/uv-text/components/uv-text/value';
-import {
-	mapMutations
-} from 'vuex'
-export default {
-	components: {
-		tabbarView,
-	},
-	data() {
-		return {
-			isLoading: false,
-			selectedGender: null,
-			tempGender: null,
-			tabbars: [],
-			ballColors: [
-				"#FF6B6B", // 红色
-				"#4ECDC4", // 青色
-				"#45B7D1", // 蓝色
-				"#96CEB4", // 绿色
-				"#FFEEAD", // 黄色
-				"#D4A5A5", // 粉色
-				"#9A8194", // 紫色
-				"#FF9F1C", // 橙色
-			],
-			showError: false,
-			formData: {
-				nickname: "",
-				sex: "其他",
-				description: "",
-				tags: [],
-			},
-			predefinedTags: [],
-			showInfo: false,
-			starImg: "",
-			noteContent: "",
-			starInfo: {},
-			state: 2, //0 是用户输入星灵基因重组仓的状态   1 是用户已经完成了匹星灵展示页面   2是用户匹配中加载的状态 3是匹配到了待点击进入设置界面 (根据其它字段判断是否失败)  4是用户设置星灵信息的页面  5是用户查看星灵信息的页面 待入驻 6是用户已经已经入驻星球了
-			sex: "",
-			selectTags: [],
-			info: {
-				"id": 0,
-				"sso_id": 0,
-				"image_id": 0,
-				"image": "",
-				"nickname": "",
-				"user_content": "",
-				"content": "",
-				"sex_id": 0,
-				"tags": "",
-				"status": 0
-			},
-			timeoutId: 0,
-			showShare: false,
-			shareTitle: "分享标题",
-			shareDesc: "",
-			shareImg: "",
-			userId: 0,
-			maxRetries: 10, // 最大重试次数
-			retryCount: 0, // 当前重试次数
-			pollingInterval: 30000, // 轮询间隔时间(毫秒)
-			editContent: '',
-		};
-	},
-	onLoad() {
-		this.aIpipeiGetinfo("get");
-		this.loadInfo()
-	},
-	methods: {
-		...mapMutations('switchingModule', ['setInformation', 'deleteInformation']),
-		// 返回上一页
-		goBack() {
-			console.log(66);
-
-			uni.navigateBack({
-				delta: 1
-			});
-		},
-		confirmGender() {
-			// if (!this.noteContent) {
-			// 	uni.showToast({
-			// 		title: "请输入匹配条件",
-			// 		icon: "none",
-			// 	});
-			// 	return;
-			// }
-			// this.selectedGender = this.noteContent;
-			this.isLoading = true;
-			this.closeContentPopUpWindow();
-			this.state = 2
-			this.apiPeiStar();
+	import tabbarView from "@/components/tabbar/tabbar.vue";
+	import value from '../../uni_modules/uv-text/components/uv-text/value';
+	import {
+		mapMutations
+	} from 'vuex'
+	export default {
+		components: {
+			tabbarView,
 		},
-		goToSetProfile() {
-			this.state = 4;
-			this.formData.nickname = ''
-			this.formData.sex = ''
-			this.formData.tags = ''
-
+		data() {
+			return {
+				isLoading: false,
+				selectedGender: null,
+				tempGender: null,
+				tabbars: [],
+				ballColors: [
+					"#FF6B6B", // 红色
+					"#4ECDC4", // 青色
+					"#45B7D1", // 蓝色
+					"#96CEB4", // 绿色
+					"#FFEEAD", // 黄色
+					"#D4A5A5", // 粉色
+					"#9A8194", // 紫色
+					"#FF9F1C", // 橙色
+				],
+				showError: false,
+				formData: {
+					nickname: "",
+					sex: "其他",
+					description: "",
+					tags: [],
+				},
+				predefinedTags: [],
+				showInfo: false,
+				starImg: "",
+				noteContent: "",
+				starInfo: {},
+				state: 2, //0 是用户输入星灵基因重组仓的状态   1 是用户已经完成了匹星灵展示页面   2是用户匹配中加载的状态 3是匹配到了待点击进入设置界面 (根据其它字段判断是否失败)  4是用户设置星灵信息的页面  5是用户查看星灵信息的页面 待入驻 6是用户已经已经入驻星球了
+				sex: "",
+				selectTags: [],
+				info: {
+					"id": 0,
+					"sso_id": 0,
+					"image_id": 0,
+					"image": "",
+					"nickname": "",
+					"user_content": "",
+					"content": "",
+					"sex_id": 0,
+					"tags": "",
+					"status": 0
+				},
+				timeoutId: 0,
+				showShare: false,
+				shareTitle: "分享标题",
+				shareDesc: "",
+				shareImg: "",
+				userId: 0,
+				maxRetries: 10, // 最大重试次数
+				retryCount: 0, // 当前重试次数
+				pollingInterval: 30000, // 轮询间隔时间(毫秒)
+				editContent: '',
+			};
 		},
-		toggleTag(tag) {
-			const index = this.formData.tags.indexOf(tag);
-			if (index > -1) {
-				this.formData.tags.splice(index, 1);
-			} else {
-				this.formData.tags.push(tag);
-			}
+		onLoad() {
+			this.aIpipeiGetinfo("get");
+			this.loadInfo()
 		},
-		handleJoin(type) {
-			if (type === 1) {
-				// 保存修改后的信息到服务器
+		methods: {
+			...mapMutations('switchingModule', ['setInformation', 'deleteInformation']),
+			// 返回上一页
+			goBack() {
+				console.log(66);
+
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			confirmGender() {
+				// if (!this.noteContent) {
+				// 	uni.showToast({
+				// 		title: "请输入匹配条件",
+				// 		icon: "none",
+				// 	});
+				// 	return;
+				// }
+				// this.selectedGender = this.noteContent;
+				this.isLoading = true;
+				this.closeContentPopUpWindow();
+				this.state = 2
+				this.apiPeiStar();
+			},
+			goToSetProfile() {
+				this.state = 4;
+				this.formData.nickname = ''
+				this.formData.sex = ''
+				this.formData.tags = ''
+
+			},
+			toggleTag(tag) {
+				const index = this.formData.tags.indexOf(tag);
+				if (index > -1) {
+					this.formData.tags.splice(index, 1);
+				} else {
+					this.formData.tags.push(tag);
+				}
+			},
+			handleJoin(type) {
+				if (type === 1) {
+					// 保存修改后的信息到服务器
+					uni.request({
+						url: this.$apiHost + "/AIpipei/gogogo",
+						data: {
+							uuid: getApp().globalData.uuid,
+							nickname: this.starInfo.nickname,
+							content: this.starInfo.content,
+						},
+						header: {
+							"content-type": "application/x-www-form-urlencoded",
+							sign: getApp().globalData.headerSign,
+						},
+						method: "POST",
+						success: (res) => {
+							console.log("res.data", res.data);
+							uni.showToast({
+								title: res.data.str,
+								icon: "none",
+								duration: 2000,
+							});
+							if (res.data.success === "yes") {
+								this.aIpipeiGetinfo({
+									polling: false
+								});
+							}
+
+						}
+					});
+				} else {
+					// 已入驻状态,直接跳转
+					uni.navigateTo({
+						url: '/pages/isLand/homeLand'
+					});
+				}
+			},
+
+			// 提交用户 开始创建的命令
+			apiPeiStar() {
+
 				uni.request({
-					url: this.$apiHost + "/AIpipei/gogogo",
+					url: this.$apiHost + "/AIpipei/start",
 					data: {
 						uuid: getApp().globalData.uuid,
-						nickname: this.starInfo.nickname,
-						content: this.starInfo.content,
+						content: this.noteContent,
 					},
 					header: {
 						"content-type": "application/x-www-form-urlencoded",
 						sign: getApp().globalData.headerSign,
 					},
-					method: "POST",
+					// 设置60秒超时
+					timeout: 60000,
+					method: 'POST',
 					success: (res) => {
-						console.log("res.data", res.data);
+						setTimeout(() => {
+							if (res.data.str != "开始匹配") {
+								uni.showToast({
+									title: res.data.str,
+									icon: "none",
+									duration: 2000,
+								});
+							}
+							if (res.data.success == "no") {
+
+								setTimeout(() => {
+									this.state = 0
+									this.isLoading = false;
+									this.aIpipeiGetinfo("get");
+									this.loadInfo()
+								}, 2000);
+								// this.apiPeiStar();
+							}
+							if (res.data.str == "开始匹配") {
+								this.aIpipeiGetinfo({
+									polling: true
+								})
+
+							}
+
+						}, 3000);
+
+					},
+					fail: (err) => {
+						console.error("请求失败:", err);
+						// 显示错误提示
 						uni.showToast({
-							title: res.data.str,
+							title: "网络请求失败,请重试",
 							icon: "none",
 							duration: 2000,
 						});
-						if (res.data.success === "yes") {
-							this.aIpipeiGetinfo({
-								polling: false
-							});
-						}
 
-					}
-				});
-			} else {
-				// 已入驻状态,直接跳转
-				uni.navigateTo({
-					url: '/pages/isLand/homeLand'
-				});
-			}
-		},
-
-		// 提交用户 开始创建的命令
-		apiPeiStar() {
-
-			uni.request({
-				url: this.$apiHost + "/AIpipei/start",
-				data: {
-					uuid: getApp().globalData.uuid,
-					content: this.noteContent,
-				},
-				header: {
-					"content-type": "application/x-www-form-urlencoded",
-					sign: getApp().globalData.headerSign,
-				},
-				// 设置60秒超时
-				timeout: 60000,
-				method: 'POST',
-				success: (res) => {
-					setTimeout(() => {
-						if (res.data.str != "开始匹配") {
-							uni.showToast({
-								title: res.data.str,
-								icon: "none",
-								duration: 2000,
-							});
-						}
-						if (res.data.success == "no") {
+						// 重置加载状态
 
-							setTimeout(() => {
-								this.state = 0
-								this.isLoading = false;
-								this.aIpipeiGetinfo("get");
-								this.loadInfo()
-							}, 2000);
-							// this.apiPeiStar();
-						}
-						if (res.data.str == "开始匹配") {
-							this.aIpipeiGetinfo({
-								polling: true
-							})
-
-						}
-
-					}, 3000);
-
-				},
-				fail: (err) => {
-					console.error("请求失败:", err);
-					// 显示错误提示
-					uni.showToast({
-						title: "网络请求失败,请重试",
-						icon: "none",
-						duration: 2000,
-					});
-
-					// 重置加载状态
-
-				},
-				complete: () => {
+					},
+					complete: () => {
 
-				},
-			});
+					},
+				});
 
 
-		},
-		loadInfo() {
-			console.log({
-				uuid: getApp().globalData.uuid,
-				skey: getApp().globalData.skey,
-			});
-			uni.request({
-				url: this.$apiHost + "/User/getinfo",
-				data: {
+			},
+			loadInfo() {
+				console.log({
 					uuid: getApp().globalData.uuid,
 					skey: getApp().globalData.skey,
-				},
-				header: {
-					"content-type": "application/json",
-					sign: getApp().globalData.headerSign,
-				},
-				success: (res) => {
-					console.log("----:", JSON.parse(JSON.stringify(res.data)));
-					if (res.data) {
-						this.userId = res.data.user_id
-					}
-
-				},
-				complete: (com) => {
-					// uni.hideLoading();
-				},
-				fail: (e) => {
-					console.log("----e:", e);
-				},
-			});
-		},
-		// 查询Ai匹配信息
-		aIpipeiGetinfo({
-			polling
-		}) {
-			// 清除之前的定时器
-			if (this.timeoutId) {
-				clearTimeout(this.timeoutId);
-				this.timeoutId = 0;
-			}
+				});
+				uni.request({
+					url: this.$apiHost + "/User/getinfo",
+					data: {
+						uuid: getApp().globalData.uuid,
+						skey: getApp().globalData.skey,
+					},
+					header: {
+						"content-type": "application/json",
+						sign: getApp().globalData.headerSign,
+					},
+					success: (res) => {
+						console.log("----:", JSON.parse(JSON.stringify(res.data)));
+						if (res.data) {
+							this.userId = res.data.user_id
+						}
 
-			// 检查是否超过最大重试次数
-			if (polling && this.retryCount >= this.maxRetries) {
-				uni.showToast({
-					title: '匹配超时,请重新尝试',
-					icon: 'none',
-					duration: 2000
+					},
+					complete: (com) => {
+						// uni.hideLoading();
+					},
+					fail: (e) => {
+						console.log("----e:", e);
+					},
 				});
-				this.retryCount = 0;
-				this.state = 0;
-				return;
-			}
+			},
+			// 查询Ai匹配信息
+			aIpipeiGetinfo({
+				polling
+			}) {
+				// 清除之前的定时器
+				if (this.timeoutId) {
+					clearTimeout(this.timeoutId);
+					this.timeoutId = 0;
+				}
 
-			// 发起请求
-			uni.request({
-				url: this.$apiHost + "/AIpipei/getinfo",
-				data: {
-					uuid: getApp().globalData.uuid,
-				},
-				header: {
-					"content-type": "application/json",
-					sign: getApp().globalData.headerSign,
-				},
-				timeout: 60000,
-				success: (res) => {
-					console.log("查询到生成信息", res.data);
-					// 重置重试计数
+				// 检查是否超过最大重试次数
+				if (polling && this.retryCount >= this.maxRetries) {
+					uni.showToast({
+						title: '匹配超时,请重新尝试',
+						icon: 'none',
+						duration: 2000
+					});
 					this.retryCount = 0;
+					this.state = 0;
+					return;
+				}
 
-					if (res && res.data && res.data.info) {
-						if (res.data.info.content) {
-							res.data.info.content = res.data.info.content.replace(/^\n+/, '')
-							console.log(res.data.info.content);
-						}
-						if (res.data.info && res.data.info.tags != "") {
-							res.data.info.tags = res.data.info.tags.split(",");
-							this.predefinedTags = res.data.info.tags.map(tag => {
-								return {
-									text: tag,
-									value: tag
+				// 发起请求
+				uni.request({
+					url: this.$apiHost + "/AIpipei/getinfo",
+					data: {
+						uuid: getApp().globalData.uuid,
+					},
+					header: {
+						"content-type": "application/json",
+						sign: getApp().globalData.headerSign,
+					},
+					timeout: 60000,
+					success: (res) => {
+						console.log("查询到生成信息", res.data);
+						// 重置重试计数
+						this.retryCount = 0;
+
+						if (res && res.data && res.data.info) {
+							if (res.data.info.content) {
+								res.data.info.content = res.data.info.content.replace(/^\n+/, '')
+								console.log(res.data.info.content);
+							}
+							if (res.data.info && res.data.info.tags != "") {
+								res.data.info.tags = res.data.info.tags.split(",");
+								this.predefinedTags = res.data.info.tags.map(tag => {
+									return {
+										text: tag,
+										value: tag
+									}
+								})
+								console.log(666, res);
+								this.setInformation(res.data.info)
+								this.shareTitle = res.data.info.nickname
+								this.shareDesc = res.data.info.content
+								this.shareImg = res.data.info.image
+								// this.userId = res.data.user_id
+							} else {
+								res.data.info.tags = []
+								this.deleteInformation()
+							}
+							// 实现状态的判断
+							// 更改状态为 用户还未匹配过 待输入匹配内容
+
+							if (res.data.success == "no") {
+								if (res.data.str == "没有匹配过" ) {
+									this.state = 0
+									setTimeout(() => {
+										this.openContentPopUpWindow();
+									}, 300);
+									return ;
 								}
-							})
-							console.log(666, res);
-							this.setInformation(res.data.info)
-							this.shareTitle = res.data.info.nickname
-							this.shareDesc = res.data.info.content
-							this.shareImg = res.data.info.image
-							// this.userId = res.data.user_id
-						} else {
-							res.data.info.tags = []
-							this.deleteInformation()
-						}
-						// 实现状态的判断
-						// 更改状态为 用户还未匹配过 待输入匹配内容
-						if (res.data.str == "没有匹配过" && res.data.info) {
-							this.state = 0
-							setTimeout(() => {
-								this.openContentPopUpWindow();
-							}, 300);
-						}
-						if (res.data.success == "no") {
-							uni.showToast({
-								title: res.data.str,
-								icon: "none",
-								duration: 2000,
-							});
-							setTimeout(() => {
-								this.state = 0
+								uni.showToast({
+									title: res.data.str,
+									icon: "none",
+									duration: 2000,
+								});
 								setTimeout(() => {
-									this.openContentPopUpWindow();
-								}, 300);
-							}, 2000);
+									this.state = 0
+									setTimeout(() => {
+										this.openContentPopUpWindow();
+									}, 300);
+								}, 2000);
+							}
+
+							// 更改状态为 用户还匹配成功时 待点击设置心灵简介
+							if (res.data.info.image && res.data.info.status == 2) {
+								this.state = 1
+								this.isLoading = false
+								// this.openContentPopUpWindow();
+							}
+							if (res.data.info.image && res.data.info.status == 1) {
+								this.state = 6
+								this.isLoading = false
+							}
+							if (res.data.info.image && res.data.info.status == 3) {
+								this.state = 5
+								this.isLoading = false
+							}
+							this.starInfo = res.data.info;
+
+							if (res.data.info.content) {
+								this.formData.description = res.data.info.content;
+							}
 						}
 
-						// 更改状态为 用户还匹配成功时 待点击设置心灵简介
-						if (res.data.info.image && res.data.info.status == 2) {
-							this.state = 1
-							this.isLoading = false
-							// this.openContentPopUpWindow();
-						}
-						if (res.data.info.image && res.data.info.status == 1) {
-							this.state = 6
-							this.isLoading = false
-						}
-						if (res.data.info.image && res.data.info.status == 3) {
-							this.state = 5
-							this.isLoading = false
-						}
-						this.starInfo = res.data.info;
-
-						if (res.data.info.content) {
-							this.formData.description = res.data.info.content;
-						}
-					}
-
-				},
-				fail: (err) => {
-					console.error("请求失败:", err);
-					// 增加重试计数
-					this.retryCount++;
+					},
+					fail: (err) => {
+						console.error("请求失败:", err);
+						// 增加重试计数
+						this.retryCount++;
 
-					// 显示错误提示
-					uni.showToast({
-						title: `网络请求失败,第${this.retryCount}次重试`,
-						icon: "none",
-						duration: 2000,
-					});
+						// 显示错误提示
+						uni.showToast({
+							title: `网络请求失败,第${this.retryCount}次重试`,
+							icon: "none",
+							duration: 2000,
+						});
 
-					// 如果是网络超时,自动重试
-					if (err.errMsg.includes("timeout")) {
-						setTimeout(() => {
-							console.log("请求超时,正在重试...");
-							this.aIpipeiGetinfo({
-								polling: true
-							});
-						}, 6000);
-					}
-				},
-				complete: () => {
-					// 如果需要继续轮询,设置下一次请求
-					if (polling) {
-						this.timeoutId = setTimeout(() => {
-							this.aIpipeiGetinfo({
-								polling: true
-							});
-						}, this.pollingInterval);
+						// 如果是网络超时,自动重试
+						if (err.errMsg.includes("timeout")) {
+							setTimeout(() => {
+								console.log("请求超时,正在重试...");
+								this.aIpipeiGetinfo({
+									polling: true
+								});
+							}, 6000);
+						}
+					},
+					complete: () => {
+						// 如果需要继续轮询,设置下一次请求
+						if (polling) {
+							this.timeoutId = setTimeout(() => {
+								this.aIpipeiGetinfo({
+									polling: true
+								});
+							}, this.pollingInterval);
+						}
 					}
+				});
+			},
+			// 保存表单信息
+			submitStar() {
+				this.formData.tags = this.selectTags.join(",");
+				let that = this;
+				uni.showLoading({
+					mask: true,
+				});
+				if (this.formData.sex) {
+					this.formData.sex = this.genderScreeningId(this.formData.sex);
 				}
-			});
-		},
-		// 保存表单信息
-		submitStar() {
-			this.formData.tags = this.selectTags.join(",");
-			let that = this;
-			uni.showLoading({
-				mask: true,
-			});
-			if (this.formData.sex) {
-				this.formData.sex = this.genderScreeningId(this.formData.sex);
-			}
-			console.log({
-				uuid: getApp().globalData.uuid,
-				sex: this.formData.sex,
-				name: this.formData.nickname,
-				content: this.formData.description,
-				tags: this.formData.tags,
-
-			}, 2000);
-
-			uni.request({
-				url: this.$apiHost + "/AIpipei/save",
-				data: {
+				console.log({
 					uuid: getApp().globalData.uuid,
 					sex: this.formData.sex,
-					nickname: this.formData.nickname,
+					name: this.formData.nickname,
 					content: this.formData.description,
 					tags: this.formData.tags,
 
-				},
-				header: {
-					"content-type": "application/x-www-form-urlencoded",
-					sign: getApp().globalData.headerSign,
-				},
-				method: 'POST',
-				// 设置60秒超时
-				timeout: 10000,
-				success: (res) => {
-					console.log("res.data", res.data);
-					uni.showToast({
-						title: res.data.str,
-						icon: "none",
-						duration: 2000,
-					});
-					if (res.data.success === "yes") {
-						setTimeout(() => {
-							that.aIpipeiGetinfo({
-								polling: false
-							});
-						}, 300);
-					}
-				},
-				fail: (err) => {
-					console.error("请求失败:", err);
-					// 显示错误提示
-					uni.showToast({
-						title: "网络请求失败,请重试",
-						icon: "none",
-						duration: 2000,
-					});
-				},
-				complete: () => {
-					uni.hideLoading();
-				},
-			});
-		},
-		selectGender(option) {
-			this.formData.sex = option;
-			this.sex = option;
-		},
+				}, 2000);
 
-		openContentPopUpWindow() {
-			if (this.$refs.openContentPopUpWindow) {
-				console.log(9999, "打开");
+				uni.request({
+					url: this.$apiHost + "/AIpipei/save",
+					data: {
+						uuid: getApp().globalData.uuid,
+						sex: this.formData.sex,
+						nickname: this.formData.nickname,
+						content: this.formData.description,
+						tags: this.formData.tags,
 
-				this.$refs.openContentPopUpWindow.open();
-			}
-		},
-		closeContentPopUpWindow() {
-			if (this.$refs.openContentPopUpWindow) {
-				this.$refs.openContentPopUpWindow.close();
-			}
-		},
-		genderScreening(str) {
-			switch (str) {
-				case '0':
-					return '男'
-				case '1':
-					return '女'
-				case '2':
-					return '其它'
-			}
-		},
-		genderScreeningId(str) {
-			switch (str) {
-				case 'male':
-					return 0
-				case 'female':
-					return 1
-				case 'other':
-					return 2
-			}
-		},
-		// 显示编辑弹窗
-		showEditPopup() {
-			this.editContent = this.starInfo.content;
-			this.$refs.editPopup.open();
-		},
+					},
+					header: {
+						"content-type": "application/x-www-form-urlencoded",
+						sign: getApp().globalData.headerSign,
+					},
+					method: 'POST',
+					// 设置60秒超时
+					timeout: 10000,
+					success: (res) => {
+						console.log("res.data", res.data);
+						uni.showToast({
+							title: res.data.str,
+							icon: "none",
+							duration: 2000,
+						});
+						if (res.data.success === "yes") {
+							setTimeout(() => {
+								that.aIpipeiGetinfo({
+									polling: false
+								});
+							}, 300);
+						}
+					},
+					fail: (err) => {
+						console.error("请求失败:", err);
+						// 显示错误提示
+						uni.showToast({
+							title: "网络请求失败,请重试",
+							icon: "none",
+							duration: 2000,
+						});
+					},
+					complete: () => {
+						uni.hideLoading();
+					},
+				});
+			},
+			selectGender(option) {
+				this.formData.sex = option;
+				this.sex = option;
+			},
 
-		// 关闭编辑弹窗
-		closeEditPopup() {
-			this.$refs.editPopup.close();
-		},
+			openContentPopUpWindow() {
+				if (this.$refs.openContentPopUpWindow) {
+					console.log(9999, "打开");
+
+					this.$refs.openContentPopUpWindow.open();
+				}
+			},
+			closeContentPopUpWindow() {
+				if (this.$refs.openContentPopUpWindow) {
+					this.$refs.openContentPopUpWindow.close();
+				}
+			},
+			genderScreening(str) {
+				switch (str) {
+					case '0':
+						return '男'
+					case '1':
+						return '女'
+					case '2':
+						return '其它'
+				}
+			},
+			genderScreeningId(str) {
+				switch (str) {
+					case 'male':
+						return 0
+					case 'female':
+						return 1
+					case 'other':
+						return 2
+				}
+			},
+			// 显示编辑弹窗
+			showEditPopup() {
+				this.editContent = this.starInfo.content;
+				this.$refs.editPopup.open();
+			},
 
-		// 保存编辑内容
-		saveEdit() {
-			this.starInfo.content = this.editContent;
-			this.closeEditPopup();
+			// 关闭编辑弹窗
+			closeEditPopup() {
+				this.$refs.editPopup.close();
+			},
+
+			// 保存编辑内容
+			saveEdit() {
+				this.starInfo.content = this.editContent;
+				this.closeEditPopup();
+			},
 		},
-	},
-};
+	};
 </script>
 
 <style lang="scss">
-@import "./myStar.scss";
-
-.openContentPopUpWindow {
-	::v-deep.uv-textarea {
-		width: 694rpx !important;
-		border-radius: 20rpx !important;
-		border: 1rpx solid #000000 !important;
-		margin: 0 auto;
-		margin-bottom: 44rpx;
-		min-height: 300rpx;
-		padding-bottom: 40rpx;
-
-		.uv-textarea__field {
-			min-height: 200rpx !important;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #1f1f1f;
+	@import "./myStar.scss";
+
+	.openContentPopUpWindow {
+		::v-deep.uv-textarea {
+			width: 694rpx !important;
+			border-radius: 20rpx !important;
+			border: 1rpx solid #000000 !important;
+			margin: 0 auto;
+			margin-bottom: 44rpx;
+			min-height: 300rpx;
+			padding-bottom: 40rpx;
+
+			.uv-textarea__field {
+				min-height: 200rpx !important;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #1f1f1f;
+			}
 		}
 	}
-}
 
-.textarea-container {
-	.textarea {
-		background: #f2f6f2 !important;
-		min-height: 100rpx;
+	.textarea-container {
+		.textarea {
+			background: #f2f6f2 !important;
+			min-height: 100rpx;
+		}
 	}
-}
 
-.tags-container {
+	.tags-container {
 
 
-	::v-deep.checklist-box {
-		border-radius: 16rpx !important;
-		border: 2rpx solid #1f1f1f !important;
-		background-color: #fff !important;
-		display: flex;
-		align-items: center;
-		justify-content: center;
+		::v-deep.checklist-box {
+			border-radius: 16rpx !important;
+			border: 2rpx solid #1f1f1f !important;
+			background-color: #fff !important;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 
-		.checklist-text {
+			.checklist-text {
 
-			font-size: 28rpx;
-			color: #1f1f1f;
-			font-family: "PingFang SC-Bold" !important;
-		}
+				font-size: 28rpx;
+				color: #1f1f1f;
+				font-family: "PingFang SC-Bold" !important;
+			}
 
-		&.is-checked {
-			background: #f7ffea !important;
-			border-color: #7ebc00 !important;
+			&.is-checked {
+				background: #f7ffea !important;
+				border-color: #7ebc00 !important;
 
-			.checklist-text {
-				color: #1f1f1f !important;
+				.checklist-text {
+					color: #1f1f1f !important;
+				}
 			}
 		}
 	}
-}
 
 
 
-.star-container {
+	.star-container {
 
-	/* 自定义导航栏样式 */
-	.custom-navbar {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		width: 100%;
-		height: calc(90rpx + var(--status-bar-height));
-		padding: 0 20rpx;
-		padding-top: var(--status-bar-height);
-		background-color: transparent;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 100;
-		background: transparent;
-
-		&::before {
-			content: '';
-			position: absolute;
+		/* 自定义导航栏样式 */
+		.custom-navbar {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			height: calc(90rpx + var(--status-bar-height));
+			padding: 0 20rpx;
+			padding-top: var(--status-bar-height);
+			background-color: transparent;
+			position: fixed;
 			top: 0;
 			left: 0;
-			width: 100%;
-			height: var(--status-bar-height);
-			background-color: #fff;
-			z-index: -1;
-		}
+			z-index: 100;
+			background: transparent;
+
+			&::before {
+				content: '';
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: var(--status-bar-height);
+				background-color: #fff;
+				z-index: -1;
+			}
 
-		.navbar-left {
-			width: 80rpx;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
+			.navbar-left {
+				width: 80rpx;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 
-			.fa-angle-left {
-				font-size: 48rpx;
-				color: #333;
+				.fa-angle-left {
+					font-size: 48rpx;
+					color: #333;
+				}
 			}
-		}
 
-		.navbar-right {
-			width: 80rpx;
-			height: 80rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
+			.navbar-right {
+				width: 80rpx;
+				height: 80rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-			.fa-ellipsis-h {
-				font-size: 36rpx;
-				color: #333;
+				.fa-ellipsis-h {
+					font-size: 36rpx;
+					color: #333;
+				}
 			}
 		}
-	}
 
-}
+	}
 
-.edit-popup {
-	width: 600rpx;
-	background: #fff;
-	border-radius: 24rpx;
-	padding: 40rpx 32rpx;
+	.edit-popup {
+		width: 600rpx;
+		background: #fff;
+		border-radius: 24rpx;
+		padding: 40rpx 32rpx;
 
-	.popup-title {
-		font-size: 32rpx;
-		font-weight: bold;
-		text-align: center;
-		margin-bottom: 32rpx;
-		color: #000;
-	}
+		.popup-title {
+			font-size: 32rpx;
+			font-weight: bold;
+			text-align: center;
+			margin-bottom: 32rpx;
+			color: #000;
+		}
 
-	.popup-content {
-		margin-bottom: 32rpx;
+		.popup-content {
+			margin-bottom: 32rpx;
 
-		.edit-textarea {
-			background: #F7F7F7;
-			border-radius: 16rpx;
-			padding: 24rpx;
-			min-height: 160rpx;
+			.edit-textarea {
+				background: #F7F7F7;
+				border-radius: 16rpx;
+				padding: 24rpx;
+				min-height: 160rpx;
 
-			::v-deep .uv-textarea__field {
-				font-size: 28rpx;
-				color: #333;
+				::v-deep .uv-textarea__field {
+					font-size: 28rpx;
+					color: #333;
+				}
 			}
 		}
-	}
 
-	.popup-buttons {
-		display: flex;
-		justify-content: space-between;
-		gap: 24rpx;
-
-		.cancel-btn,
-		.confirm-btn {
-			flex: 1;
-			height: 88rpx;
-			line-height: 88rpx;
-			text-align: center;
-			border-radius: 44rpx;
-			font-size: 32rpx;
-			font-weight: 500;
-		}
+		.popup-buttons {
+			display: flex;
+			justify-content: space-between;
+			gap: 24rpx;
+
+			.cancel-btn,
+			.confirm-btn {
+				flex: 1;
+				height: 88rpx;
+				line-height: 88rpx;
+				text-align: center;
+				border-radius: 44rpx;
+				font-size: 32rpx;
+				font-weight: 500;
+			}
 
-		.cancel-btn {
-			background: #fff;
-			color: #333;
-			border: 2rpx solid #E5E5E5;
-		}
+			.cancel-btn {
+				background: #fff;
+				color: #333;
+				border: 2rpx solid #E5E5E5;
+			}
 
-		.confirm-btn {
-			background: #000;
-			color: #fff;
+			.confirm-btn {
+				background: #000;
+				color: #fff;
+			}
 		}
 	}
-}
-
-.description-title {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
 
-	.edit-button {
-		color: #7ebc00;
-		font-size: 28rpx;
+	.description-title {
 		display: flex;
+		justify-content: space-between;
 		align-items: center;
 
-		.fa-angle-right {
-			margin-left: 10rpx;
+		.edit-button {
+			color: #7ebc00;
+			font-size: 28rpx;
+			display: flex;
+			align-items: center;
+
+			.fa-angle-right {
+				margin-left: 10rpx;
+			}
 		}
 	}
-}
 </style>