소스 검색

修复bug

XSXS 7 달 전
부모
커밋
6add4391fb

+ 5 - 0
common/permission.js

@@ -362,6 +362,11 @@ class PermissionManager {
    * @returns {Promise<boolean>} 是否获得权限
    */
   static async request(permissionType, options = {}) {
+    // 在 H5 环境下直接返回 true
+    // #ifdef H5
+    return true;
+    // #endif
+
     const config = getPermissionConfig(permissionType, options);
     if (!config) return false;
 

+ 2 - 2
components/DialogBox/DialogBox.scss

@@ -19,7 +19,7 @@
 /* 文件重命名 */
 .dialog-box{
 	width: 80%;
-	height: 370rpx;
+	min-height: 370rpx;
 	background-color: #fff;
 	border-radius: 24rpx;
 	overflow: hidden;
@@ -58,7 +58,7 @@
 	}
 	.inquiry{
 		padding: 0 100rpx;
-		height: 120rpx;
+		min-height: 120rpx;
 		text-align: center;
 		text{
 			font-size: 28rpx;

+ 2 - 2
components/checkIn-popUp-window/checkIn-popUp-window.vue

@@ -7,12 +7,12 @@
 					<image src="@/static/me/job/rw_wenzi_03.png"></image>
 					<view class="checkInDays">
 						<view>已签到 {{ signInfo.signDay }} 天
-							<view class="line"></view> 签到提醒
+							<view v-if="false" class="line"></view> 签到提醒
 						</view>
 						<!-- <switch class="sign-switch" color="" :checked="signNotify"   /> -->
 
 						<!-- signNotify -->
-						<uv-switch v-model="falg" size="30rpx" @change="toggleSignNotify" activeColor="#acf934"
+						<uv-switch v-if="false" v-model="falg" size="30rpx" @change="toggleSignNotify" activeColor="#acf934"
 							inactiveColor="#aecc87"></uv-switch>
 					</view>
 				</view>

+ 2 - 2
components/custome-confirm/customeConfirm.scss

@@ -19,7 +19,7 @@
 /* 文件重命名 */
 .dialog-box{
 	width: 80%;
-	height: 340rpx;
+	min-height: 340rpx;
 	background-color: #28292D;
 	border-radius: 24rpx;
 	overflow: hidden;
@@ -56,7 +56,7 @@
 	}
 	.inquiry{
 		padding: 0 4%;
-		height: 120rpx;
+		min-height: 120rpx;
 		text-align: center;
 		text{
 			font-size: 28rpx;

+ 7 - 4
manifest.json

@@ -2,8 +2,8 @@
     "name" : "萌创星球",
     "appid" : "__UNI__00BD11F",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
@@ -29,7 +29,8 @@
             "Payment" : {},
             "Share" : {},
             "VideoPlayer" : {},
-            "Push" : {}
+            "Push" : {},
+            "OAuth" : {}
         },
         "distribute" : {
             "android" : {
@@ -82,7 +83,9 @@
                     }
                 },
                 "speech" : {},
-                "oauth" : {},
+                "oauth" : {
+                    "univerify" : {}
+                },
                 "push" : {
                     "unipush" : {
                         "version" : "2",

+ 1 - 2
pages.json

@@ -66,8 +66,7 @@
 		}, {
 			"path": "pages/AboutUs/UserLogoutAgreement",
 			"style": {
-				"navigationBarTitleText": "注销协议",
-				"navigationStyle": "custom",
+				"navigationBarTitleText": "注销", 
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		}, {

+ 1 - 1
pages/index/articleDetail copy.vue

@@ -529,7 +529,7 @@ export default {
 			if (n == 1) {
 				this.items = [
 					{ text: '分享作品', icon: '../../static/icon/cz_icon_fenxiangzuopin.png' },
-					{ text: '修改封面', icon: '../../static/icon/cz_icon_xiugaifengmian.png' },
+					// { text: '修改封面', icon: '../../static/icon/cz_icon_xiugaifengmian.png' },
 					{ text: '删除作品', icon: '../../static/icon/sy_icon_shanchu.png', danger: true }
 				]
 

+ 6 - 6
pages/index/articleDetail.vue

@@ -61,10 +61,10 @@
 							<uv-parse :content="articleInfo.content"></uv-parse>
 						</view>
 					</view>
-					<view class="cardLink" @click="goToDetails(workInfo.id)">
+					<view class="cardLink" v-if="workInfo.id" @click="goToDetails(workInfo.id)">
 						<image :src="workInfo.images" mode="heightFix"></image>
 						<view class="content">
-							<view class="tit">作品一号</view>
+							<view class="tit">{{workInfo.title || "暂无标题"}}</view>
 							<view class="tex">{{
 								cutTime(workInfo.create_time) || "暂无时间"
 							}}</view>
@@ -139,7 +139,7 @@
 			</view>
 		</CustomPopup>
 		<DialogBox ref="DialogBox"></DialogBox>
-		<SharePopup :visible="showShare" :userId="userId" :share-title="shareTitle" :share-desc="shareDesc" :share-img="shareImg" view="articleDetail"
+		<SharePopup :visible="showShare" :userId="userId" :share-title="shareTitle" :share-desc="shareDesc" :share-img="shareImg" view="makeDetail"
 			@close="showShare = false" />
 	</view>
 </template>
@@ -215,9 +215,9 @@ export default {
 			sms_id: 0,
 			isMessage: true,
 			showShare: false,
-			shareTitle: "分享标题",
-			shareDesc: "分享描述",
-			shareImg: "https://your-share-image.com/image.jpg",
+			shareTitle: "",
+			shareDesc: "",
+			shareImg: "",
 			userId: 0,
 		};
 	},

+ 29 - 14
pages/index/index.vue

@@ -66,8 +66,10 @@
 			<z-paging-cell class="benner-box" style="padding-bottom: 0;">
 				<sortble :default-sorts="['uvSwiper', 'classModel', 'uvSwiperCard']">
 					<template #uvSwiper>
-						<uv-swiper :list="bannerList" :autoplay="true" circular :interval="5000" indicator
-							indicator-mode="dot" height="120" radius="0"></uv-swiper>
+						<uv-swiper :list="bannerList" keyName="image" :autoplay="true" circular :interval="5000"
+							indicator indicator-mode="dot" @click="handleBannerClick" height="120" radius="0">
+
+						</uv-swiper>
 					</template>
 
 					<template #classModel>
@@ -222,7 +224,7 @@ import wWaterfall from "@/components/w-waterfall/w-waterfall.vue";
 import tabbar from "@/mixins/tabbar";
 import card from "@/components/card/card.vue";
 import lhSelectCity from "@/components/lh-select-city/index.vue";
-import { mapState,mapGetters } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 import {
 	getStorage,
 	setStorage,
@@ -286,9 +288,12 @@ export default {
 			},
 			windowHeight: uni.getWindowInfo().windowHeight,
 			bannerList: [
-				"../../static/home/home-swper.png", 
+				{
+					image: "../../static/home/home-swper.png",
+					url: "/pages/makedetail/makeImgDetail",
+				},
 			],
-			cardList: [ ],
+			cardList: [],
 			list: [], // 瀑布流全部数据
 			dataList: [],
 			tabs: ["关注", "推荐", "探索"],
@@ -338,8 +343,8 @@ export default {
 
 	computed: {
 		...mapState('switchingModule', ['isTheTask']),
-		...mapState('rightsManagement', ['teenageMode','iscontentRecommendation']),
-		...mapGetters( 'rightsManagement', ['isContent']),
+		...mapState('rightsManagement', ['teenageMode', 'iscontentRecommendation']),
+		...mapGetters('rightsManagement', ['isContent']),
 		getDayOfWeek() {
 			const days = [
 				"星期日",
@@ -391,13 +396,13 @@ export default {
 			this.initialLoad();
 		});
 	},
-	onShow() { 
-		console.log('teenageMode',this.teenageMode);
-		console.log('iscontentRecommendation',this.iscontentRecommendation); 
-		console.log('isContent',this.isContent);
-		if ( !this.isContent ) {
+	onShow() {
+		console.log('teenageMode', this.teenageMode);
+		console.log('iscontentRecommendation', this.iscontentRecommendation);
+		console.log('isContent', this.isContent);
+		if (!this.isContent) {
 			this.tabs = ["关注"];
-			this.currentTab = 0; 
+			this.currentTab = 0;
 			this.queryList();
 		} else {
 			this.tabs = ["关注", "推荐", "探索"];
@@ -466,7 +471,7 @@ export default {
 				},
 				success: (res) => {
 					console.log(this.weather, "天气数据", res.data);
-					if (res.data.data.city) { 
+					if (res.data.data.city) {
 						this.currentCity = res.data.data.city;
 						this.weather = res.data.data;
 					}
@@ -1079,6 +1084,16 @@ export default {
 				this.updateSwiperHeight();
 			}, 300);
 		},
+		handleBannerClick(index) {
+			
+			const item = this.bannerList[index];
+			console.log(111,index,item);
+			if (item && item.url) {
+				uni.navigateTo({
+					url: item.url
+				});
+			}
+		},
 	},
 };
 </script>

+ 21 - 10
pages/index/workDetail.vue

@@ -66,7 +66,7 @@
         </view>
         <view class="contentHeader">
           <view class="musicContent">
-            <text> {{ articleInfo.lyrics }}</text>
+            <text style="display: inline-block; max-width: 350rpx;"  > {{ articleInfo.lyrics }}</text>
             <image class="roll" src="@/static/icon/roll.png"></image>
           </view>
           <view class="maskLayer"></view>
@@ -516,10 +516,10 @@ export default {
               text: "分享作品",
               icon: "../../static/icon/cz_icon_fenxiangzuopin.png",
             },
-            {
-              text: "修改封面",
-              icon: "../../static/icon/cz_icon_xiugaifengmian.png",
-            },
+            // {
+            //   text: "修改封面",
+            //   icon: "../../static/icon/cz_icon_xiugaifengmian.png",
+            // },
             {
               text: "删除作品",
               icon: "../../static/icon/sy_icon_shanchu.png",
@@ -628,11 +628,22 @@ export default {
       });
     },
     goCreate() {
-      // 切换到标签页
-      uni.switchTab({
-        // 指定要切换到的页面路径
-        url: "/pages/make/index",
-      });
+		console.log(222222222);
+		let url=''
+	if(this.articleInfo.lyrics ){
+		url = "/pages/makedetail/makeMusicDetail"
+	}else{
+		url = "/pages/makedetail/makeImgDetail"
+	}
+	
+	uni.navigateTo({
+		url
+	})
+      // // 切换到标签页
+      // uni.switchTab({
+      //   // 指定要切换到的页面路径
+      //   url: "/pages/make/index",
+      // });
     },
     goToUserHomepage(id) {
       uni.$emit('check_login', () => {

+ 1 - 1
pages/login/login.vue

@@ -22,7 +22,7 @@
 				</view>
 			</block>
 			<block v-if="type == 'pass' || type == 'mobile'">
-				<template v-if="false">
+				<template v-if="true">
 					<view class="name">手机号码:</view>
 					<view class="item">
 						<input type="number" class="input" v-model="mobile" placeholder="请输入手机号码" maxlength="11" />

+ 44 - 23
pages/make/fabuArticle.vue

@@ -43,7 +43,7 @@
 			<view class="optionalWorks" @click="onManage">
 				<view class="title">
 					可选作品
-					<text v-if="id < 1">(图片或作品必选一个发布)</text>
+					<text v-if="id < 1">(图片或作品必选一个发布)</text> 
 				</view>
 				<view class="selectLeft">
 					<text class="prompt" v-if="id > 1">已选择一个作品</text>
@@ -308,38 +308,58 @@ export default {
 		},
 		onSubmit() {
 			console.log("skey", this.skey);
+
+			// 校验标题
 			if (this.checkField(this.ainfo.title, "请输入名称") == false) {
 				return;
 			}
+
+			// 校验内容
 			if (this.checkField(this.ainfo.content, "请输入具体内容") == false) {
 				return;
 			}
+
+			// 校验是否正在提交
 			if (this.is_submit > 0) {
 				return;
 			}
-			if (!this.selectedWork.id && this.img_list.length == 0) {
+
+			// 校验图片数量和作品选择
+			if (this.img_list.length < 1 && !this.selectedWork.id) {
+				uni.showToast({
+					title: '请上传 图片 或 选择一个作品',
+					icon: 'none'
+				});
+				return;
+			}else{
+						// 校验图片字符串有效性(可选,因为已经检查了图片数量)
+			if (!img_str || img_str.trim().length < 2) {
 				uni.showToast({
-					title: '请选择一个作品',
+					title: '请确保至少上传一张有效图片作为封面',
 					icon: 'none'
 				});
 				return;
 			}
-			if (this.img_list.length >= 5) {
+			// 校验图片数量不超过 5 张
+			if (this.img_list.length > 5) {
 				uni.showToast({
-					title: '最多只能上传5张图片',
+					title: '最多只能上传 5 张图片',
 					icon: 'none'
 				});
-				return
+				return;
+			}
 			}
+		
+
+			// 构建图片字符串
 			let img_str = '';
 			if (this.img_list.length > 0) {
 				for (let i = 0; i < this.img_list.length; i++) {
 					img_str += this.img_list[i] + "|";
 				}
 			}
-			if (this.checkField(img_str, "请上传至少一张图片") == false) {
-				return;
-			}
+
+		
 			let that = this;
 			this.is_submit = 1;
 			uni.request({
@@ -368,18 +388,19 @@ export default {
 					});
 					if (res.data.success == "yes") {
 						// if (that.ainfo.id > 0) {
-							console.log(1);
-							
-							setTimeout(function () {
-								uni.switchTab({ url: '/pages/index/index?' })
-							}, 500);
+						console.log(1);
+
+						setTimeout(function () {
+							uni.$emit('switchToMyPage', { type: 'article' });
+							uni.switchTab({ url: '/pages/my/my' })
+						}, 500);
 						// } else {
-							console.log(2);
-							
-							that.ainfo.title = '';
-							that.ainfo.content = '';
-							that.ainfo.num = '';
-							that.img_list = [];
+						console.log(2);
+
+						that.ainfo.title = '';
+						that.ainfo.content = '';
+						that.ainfo.num = '';
+						that.img_list = [];
 						// }
 					} else { }
 					this.is_submit = 0;
@@ -420,7 +441,7 @@ export default {
 				sourceType: ['album', 'camera'], //从相册、相机选择
 				success: function (res) {
 					console.log('res:', res)
-					for (let index = 0; index < res.tempFilePaths.length; index++) { 
+					for (let index = 0; index < res.tempFilePaths.length; index++) {
 						let filepath = "";
 						// #ifdef H5
 						filepath = res.tempFiles[index].path;
@@ -479,8 +500,8 @@ export default {
 
 
 		},
-		deleteWorkInfo(){
-			this.selectedWork={}
+		deleteWorkInfo() {
+			this.selectedWork = {}
 
 		}
 	}

+ 2 - 2
pages/make/index.vue

@@ -119,9 +119,9 @@ export default {
 				}]
 			},
 			tutorial:[
-				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQC3yyQj9gK-KnVUZOT6vYmn?identityId=2HSXOrUAEOx",subheading:"星球造物,AI创角",content:"使用自然语言,创建独属于你的智能体"},
-				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQDGgIXzR08ssYlwoy2tjiNA?identityId=2HSXOrUAEOx",subheading:"AI灵感写歌",content:"使用AI超能力释放你的无限创造力!"},
 				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQBj5luSHVkaqpJmL5PTuFfZ?identityId=2HSXOrUAEOx",subheading:"萌萌智绘魔方",content:"教你如何创作内容,激发创作灵感!" },
+				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQDGgIXzR08ssYlwoy2tjiNA?identityId=2HSXOrUAEOx",subheading:"AI灵感写歌",content:"使用AI超能力释放你的无限创造力!"},
+				{title:"官方教程",url:"https://docs.qingque.cn/d/home/eZQC3yyQj9gK-KnVUZOT6vYmn?identityId=2HSXOrUAEOx",subheading:"星球造物,AI创角",content:"使用自然语言,创建独属于你的智能体"},
 			]
 		}
 	}, 

+ 3 - 0
pages/makedetail/makeDetail.scss

@@ -405,6 +405,9 @@ page {
         width: 26rpx;
         height: 120rpx;
       }
+	  uni-text{
+		  max-width: 200rpx;
+	  }
     }
     .maskLayer {
       width: 60%;

+ 75 - 39
pages/makedetail/makeDetail.vue

@@ -4,7 +4,7 @@
 		<view>
 			<link rel="stylesheet"
 				href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-		</view> 
+		</view>
 		<!-- 权限申请提示 -->
 		<view v-if="showRights" class="permission-tip">
 			<text class="permission-title">正在获取相机、存储权限</text>
@@ -58,10 +58,10 @@
 						<image @click="toggleAudio" v-else src="@/static/makedetail/cz_icon_bofang.png"
 							class="playerButton"></image>
 					</template>
-				</view> 
+				</view>
 				<view class="contentHeader">
 					<view class="musicContent">
-						<text> {{ queueDetail.description }}</text>
+						<text style="max-width: 350rpx; display: inline-block;"> {{ queueDetail.description }}</text>
 						<image class="roll" src="@/static/icon/roll.png"></image>
 					</view>
 					<view class="maskLayer"></view>
@@ -139,8 +139,8 @@
 			</view>
 		</CustomPopup>
 		<DialogBox ref="customConfirm"></DialogBox>
-		<SharePopup :visible="showShare" :userId="userId" :share-title="shareTitle" :share-desc="shareDesc" :share-img="shareImg" view="makeDetail"
-			@close="showShare = false" />
+		<SharePopup :visible="showShare" :userId="userId" :share-title="shareTitle" :share-desc="shareDesc"
+			:share-img="shareImg" view="makeDetail" @close="showShare = false" />
 	</view>
 </template>
 
@@ -234,7 +234,7 @@ export default {
 				task_type: 0,
 				tdate: "",
 				title: "",
-				userID: 0, 
+				userID: 0,
 				xinzuo: "",
 			},
 			myinfo: {},
@@ -284,7 +284,7 @@ export default {
 			this.$refs.openContentPopUpWindow.open();
 		},
 		closeContentPopUpWindow() {
-			this.$refs.openContentPopUpWindow.close(); 
+			this.$refs.openContentPopUpWindow.close();
 		},
 		// 获取图片第一个像素的RGB值
 		getImagePixelColor() {
@@ -439,8 +439,8 @@ export default {
 						// 更新队列详情
 						this.queueDetail = res.data.data;
 						this.noteContent = res.data.data.content;
-						
-						
+
+
 						// 更新图片列表
 						if (this.queueDetail.result_images && this.queueDetail.result_images !== "") {
 							this.image_list = this.queueDetail.result_images.split(",");
@@ -459,12 +459,12 @@ export default {
 							this.audioPlayer.src = this.queueDetail.result_audio;
 						}
 						// 更新分享相关数据
-						this.shareTitle = res.data.data.song_name||'萌创星球';
+						this.shareTitle = res.data.data.song_name || '萌创星球';
 						this.shareDesc = res.data.data.description;
 						this.shareImg = this.home_image;
 						this.userId = res.data.data.sso_id;
 
-						console.log(this.shareTitle,9,this.shareDesc,2,this.shareImg,3,this.userId,4,'分享数据');
+						console.log(this.shareTitle, 9, this.shareDesc, 2, this.shareImg, 3, this.userId, 4, '分享数据');
 					} else {
 						uni.showToast({
 							title: '获取详情失败',
@@ -531,14 +531,24 @@ export default {
 					break;
 				case '修改封面':
 					// 修改封面
-					if (this.fileInformation.status == 3) {
-						uni.showToast({
-							title: '作品已完成,无法修改封面!',
-							icon: 'none'
-						});
+					if (this.queueDetail.status == 9 && (this.fileInformation.status == 3 || this.fileInformation.status == 0)) {
+						this.editCover();
+
+					} else {
+						if (this.queueDetail.status == 9) {
+							uni.showToast({
+								title: '作品已完成,无法修改封面!',
+								icon: 'none'
+							});
+						} else {
+							uni.showToast({
+								title: '作品未完成,无法修改封面!',
+								icon: 'none'
+							});
+						}
+
 						break;
 					}
-					this.editCover();
 					break;
 				case '删除作品':
 					// 删除作品
@@ -555,6 +565,7 @@ export default {
 			var _self = this;
 			const hasPermission = await this.checkCameraPermission();
 			if (!hasPermission) return;
+			console.log(1111111);
 
 			uni.chooseImage({
 				count: 1,
@@ -575,7 +586,7 @@ export default {
 								console.log('Success11:', uploadFileRes);
 								console.log('Success21:', resdata);
 								if (resdata.success == 'yes') {
-									_self.home_image = resdata.url;
+
 									// 调用修改封面接口
 									uni.request({
 										url: _self.$apiHost + '/WorkAI/queueAction',
@@ -592,6 +603,7 @@ export default {
 										},
 										success: async (res) => {
 											if (res.data.success === "yes") {
+												_self.home_image = resdata.url;
 												uni.showToast({
 													title: '修改封面成功',
 													icon: 'success'
@@ -645,12 +657,12 @@ export default {
 				})
 				.then((res) => {
 					console.log(res);
-					
+
 					if (res.confirm) {
 						// 用户点击确定,执行删除操作
 						this.confirmDelete();
 					}
-				},()=>{});
+				}, () => { });
 		},
 		// 确认删除
 		confirmDelete() {
@@ -662,7 +674,7 @@ export default {
 			if (this.queueDetail.status == 9) {
 				url = this.$apiHost + '/Work/doAct';
 				id = this.queueId;
-			} 
+			}
 			uni.request({
 				url,
 				method: 'GET',
@@ -853,7 +865,7 @@ export default {
 		async chooseImage(sourceType) {
 			try {
 				let hasPermission = false;
-				
+
 				if (sourceType === 'camera') {
 					hasPermission = await this.checkCameraPermission();
 				} else if (sourceType === 'album') {
@@ -917,27 +929,51 @@ export default {
 				url: _self.$apiHost + '/Xweb/upload_img?skey=' + _self.skey,
 				filePath: tempFilePath,
 				name: 'file',
-				success: function(uploadFileRes) {
-					let resdata = JSON.parse(uploadFileRes.data);
-					console.log('Success:', uploadFileRes);
-					console.log('Upload data:', resdata);
+				success: function (uploadFileRes) {
+					let resdata = JSON.parse(uploadFileRes.data)
+					console.log('Success11:', uploadFileRes);
+					console.log('Success21:', resdata);
 					if (resdata.success == 'yes') {
-						_self.showRights = false;
-						_self.home_image = resdata.url;
-						uni.showToast({
-							title: '图片上传成功',
-							icon: 'success',
-							duration: 1500
-						});
-					} else {
-						uni.showToast({
-							title: resdata.msg || '上传失败',
-							icon: 'none',
-							duration: 1500
+
+						// 调用修改封面接口
+						uni.request({
+							url: _self.$apiHost + '/WorkAI/queueAction',
+							method: 'GET',
+							data: {
+								uuid: getApp().globalData.uuid,
+								act: 'editImg',
+								result_images: resdata.url,
+								id: _self.arcID
+							},
+							header: {
+								'content-type': 'application/json',
+								'sign': getApp().globalData.headerSign
+							},
+							success: async (res) => {
+								if (res.data.success === "yes") {
+									_self.showRights = false;
+									_self.home_image = resdata.url;
+									uni.showToast({
+										title: '修改封面成功',
+										icon: 'success'
+									});
+								} else {
+									uni.showToast({
+										title: '修改封面失败',
+										icon: 'none'
+									});
+								}
+							},
+							fail: () => {
+								uni.showToast({
+									title: '修改封面失败',
+									icon: 'none'
+								});
+							}
 						});
 					}
 				},
-				fail: function(uploadFileFail) {
+				fail: function (uploadFileFail) {
 					console.error('Error:', uploadFileFail);
 					uni.showToast({
 						title: '上传失败,请重试',

+ 1 - 0
pages/makedetail/makeImgDetail.vue

@@ -364,6 +364,7 @@ export default {
 							// uni.navigateBack()
 							// 使用全局变量存储状态
 							getApp().globalData.needSwitchToGenerating = true;
+							uni.$emit('switchToMyPage', { type: 'generatingInProgress' });
 							uni.switchTab({ url: '/pages/my/my' });
 						}, 1500);
 					}

+ 1 - 0
pages/makedetail/makeMusicDetail.vue

@@ -314,6 +314,7 @@ export default {
 							// uni.navigateBack()
 							// 使用全局变量存储状态
 							getApp().globalData.needSwitchToGenerating = true;
+							uni.$emit('switchToMyPage', { type: 'generatingInProgress' });
 							uni.switchTab({ url: '/pages/my/my' });
 						}, 1500);
 					}

+ 190 - 153
pages/my/DelMemConfirm.vue

@@ -1,161 +1,198 @@
 <template>
-  <view class="page">
-    <view class="list_info">
-      <view class="title">为保证你的账号安全,在你提交的注销申请生效前,需同时满足以下条件</view>
-
-      <view class="content">
-        <view class="paragraph">
-          <view class="subheading">1. 账号处于安全状态</view>
-          <view class="subtitle">账号处于正常使用状态,无被盗风险</view>
-        </view>
-        <view class="paragraph">
-          <view class="subheading">2.账号权限解除</view>
-          <view class="subtitle">账号已解除与其他产品的授权登录或绑定关系</view>
-        </view>
-        <view class="paragraph">
-          <view class="subheading">3.账号无任何纠纷,包括投诉举报</view>
-          <view class="subtitle">本账号及通过本账号接入的第三方产品中没有未完成和/或存在争议的服务
-            <view style="margin-top: 10rpx;">本账号无任何纠纷,包括投诉举报、侵权等</view>
-          </view>
-        </view>
-        <view class="paragraph red">
-          注意:删除账号后,你将无法找回账号信息,你的所有数据和消息也会一并删除
-        </view>
-      </view>
-      <view class="agree">
-        <checkbox-group @change="agreeChange">
-          <label>
-            <checkbox value="agree" :checked="agree" :class="{ 'checked': agree, 'custom-checkbox': true }"
-              style="display: none;" />
-            <view class="custom-checkbox-box" :class="{ 'checked': agree }"></view>
-          </label>
-        </checkbox-group>
-        <text @click="goPage()"><text style="color: #7c7c7c;padding-right: 5rpx;">我已阅读并同意</text> 注销协议</text>
-      </view>
-      <view class="btn_submit" @click="nextStep" :class="{ disabled: !agree }">下一步</view>
-    </view>
-  </view>
+	<view class="page">
+		<view class="list_info">
+			<view class="title">为保证你的账号安全,在你提交的注销申请生效前,需同时满足以下条件</view>
+
+			<view class="content">
+				<view class="paragraph">
+					<view class="subheading">1. 账号处于安全状态</view>
+					<view class="subtitle">账号处于正常使用状态,无被盗风险</view>
+				</view>
+				<view class="paragraph">
+					<view class="subheading">2.账号权限解除</view>
+					<view class="subtitle">账号已解除与其他产品的授权登录或绑定关系</view>
+				</view>
+				<view class="paragraph">
+					<view class="subheading">3.账号无任何纠纷,包括投诉举报</view>
+					<view class="subtitle">本账号及通过本账号接入的第三方产品中没有未完成和/或存在争议的服务
+						<view style="margin-top: 10rpx;">本账号无任何纠纷,包括投诉举报、侵权等</view>
+					</view>
+				</view>
+				<view class="paragraph red">
+					注意:删除账号后,你将无法找回账号信息,你的所有数据和消息也会一并删除
+				</view>
+			</view>
+			<view class="agree">
+				<checkbox-group @change="agreeChange">
+					<label>
+						<checkbox value="agree" :checked="agree" :class="{ 'checked': agree, 'custom-checkbox': true }"
+							style="display: none;" />
+						<view class="custom-checkbox-box" :class="{ 'checked': agree }"></view>
+					</label>
+				</checkbox-group>
+				<text @click="goPage()"><text style="color: #7c7c7c;padding-right: 5rpx;">我已阅读并同意</text> 注销协议</text>
+			</view>
+			<view class="btn_submit" @click="DelMem()" :class="{ disabled: !agree }">下一步</view>
+		</view>
+		<DialogBox ref="DialogBox"></DialogBox>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      agree: false,
-    };
-  },
-  methods: {
-    goPage() { 
-      uni.navigateTo({
-        url: '/pages/AboutUs/UserLogoutAgreement'
-      })
-
-    },
-    agreeChange(e) {
-      this.agree = e.detail.value.includes('agree');
-    },
-    nextStep() {
-      if (this.agree) {
-        uni.navigateTo({
-          url: '/pages/my/DelMemVerify',
-        });
-      }
-    },
-  },
-};
+	import DialogBox from '@/components/DialogBox/DialogBox.vue';
+	export default {
+		components: {
+			DialogBox
+		},
+		data() {
+			return {
+				agree: false,
+			};
+		},
+		methods: {
+			goPage() {
+				uni.navigateTo({
+					url: '/pages/AboutUs/UserLogoutAgreement'
+				})
+
+			},
+			agreeChange(e) {
+				this.agree = e.detail.value.includes('agree');
+			},
+			nextStep() {
+				if (this.agree) {
+					uni.navigateTo({
+						url: '/pages/my/DelMemVerify',
+					});
+				}
+			},
+			// 目前逻辑当前页面直接注销
+			DelMem() {
+				var that = this;
+				//   验证原始手机号 
+				var that = this;
+				this.$refs['DialogBox'].confirm({
+					title: '警告',
+					content: '1、注销账号是不可逆操作,该账号下所有一切资料一旦注销无法恢复;\n2、注销后,你账号下所有权益将被清除。',
+					DialogType: 'inquiry',
+					btn1: '否',
+					btn2: '是',
+					animation: 0
+				}).then(() => {
+					uni.request({
+						url: that.$apiHost + '/My/delete', //检测是否已绑定
+						data: {
+							uuid: getApp().globalData.uuid
+						},
+						header: {
+							'content-type': 'application/json' //自定义请求头信息
+						},
+						success: (res) => {
+							uni.removeStorageSync("wapptoken");
+							uni.redirectTo({
+								url: '/pages/login/login',
+							})
+						}
+					})
+				}).catch(() => {
+					// 点击取消按钮的回调
+				}) 
+			},
+		},
+	};
 </script>
 
 <style scoped lang="scss">
-.page {
-  padding: 40rpx;
-  box-sizing: border-box;
-}
-
-.list_info {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: center;
-  color: #1F1F1F;
-
-  .title {
-    margin-top: 60rpx;
-    font-family: 'PingFang SC-Bold';
-    font-weight: 400;
-    font-size: 40rpx;
-    margin-bottom: 34rpx;
-  }
-
-  .paragraph {
-    margin-bottom: 36rpx;
-
-    .subheading {
-      font-size: 28rpx;
-      font-family: 'PingFang SC-Bold';
-      font-weight: 400;
-    }
-
-    .subtitle {
-      margin-top: 4rpx;
-      font-size: 24rpx;
-      font-family: 'PingFang SC';
-      font-weight: 400;
-      color: #7C7C7C;
-    }
-
-    &.red {
-      color: #FF0000;
-      font-size: 24rpx;
-      font-weight: 400;
-    }
-  }
-
-  .agree {
-    margin-top: 200rpx;
-    text-align: left;
-    width: 626rpx;
-    color: #333;
-    font-size: 28rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 24rpx;
-    font-family: 'PingFang SC-Medium';
-
-    .custom-checkbox-box {
-      display: inline-block;
-      width: 28rpx;
-      height: 28rpx;
-      background-image: url('../../static/icon/wd_icon_gouxuan01.png'); // 未选中状态图片路径
-      background-size: cover;
-      margin-right: 10rpx;
-      vertical-align: middle;
-
-    }
-
-    .custom-checkbox-box.checked {
-      background-image: url('../../static/icon/wd_icon_gouxuan02.png'); // 选中状态图片路径 
-    }
-  }
-
-  .btn_submit {
-    width: 660rpx;
-    height: 96rpx;
-    margin: 0 auto;
-    margin-top: 40rpx;
-    background: #1f1f1f;
-    border-radius: 50rpx;
-    font-weight: bold;
-    font-size: 32rpx;
-    color: #ffffff;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-
-    &.disabled {
-      background: #999;
-    }
-  }
-}
+	.page {
+		padding: 40rpx;
+		box-sizing: border-box;
+	}
+
+	.list_info {
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		color: #1F1F1F;
+
+		.title {
+			margin-top: 60rpx;
+			font-family: 'PingFang SC-Bold';
+			font-weight: 400;
+			font-size: 40rpx;
+			margin-bottom: 34rpx;
+		}
+
+		.paragraph {
+			margin-bottom: 36rpx;
+
+			.subheading {
+				font-size: 28rpx;
+				font-family: 'PingFang SC-Bold';
+				font-weight: 400;
+			}
+
+			.subtitle {
+				margin-top: 4rpx;
+				font-size: 24rpx;
+				font-family: 'PingFang SC';
+				font-weight: 400;
+				color: #7C7C7C;
+			}
+
+			&.red {
+				color: #FF0000;
+				font-size: 24rpx;
+				font-weight: 400;
+			}
+		}
+
+		.agree {
+			margin-top: 200rpx;
+			text-align: left;
+			width: 626rpx;
+			color: #333;
+			font-size: 28rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 24rpx;
+			font-family: 'PingFang SC-Medium';
+
+			.custom-checkbox-box {
+				display: inline-block;
+				width: 28rpx;
+				height: 28rpx;
+				background-image: url('../../static/icon/wd_icon_gouxuan01.png'); // 未选中状态图片路径
+				background-size: cover;
+				margin-right: 10rpx;
+				vertical-align: middle;
+
+			}
+
+			.custom-checkbox-box.checked {
+				background-image: url('../../static/icon/wd_icon_gouxuan02.png'); // 选中状态图片路径 
+			}
+		}
+
+		.btn_submit {
+			width: 660rpx;
+			height: 96rpx;
+			margin: 0 auto;
+			margin-top: 40rpx;
+			background: #1f1f1f;
+			border-radius: 50rpx;
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #ffffff;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+
+			&.disabled {
+				background: #999;
+			}
+		}
+	}
 </style>

+ 1 - 1
pages/my/feedback.vue

@@ -140,7 +140,7 @@ export default {
 					if (res.data.success === 'yes') {
 						uni.showToast({
 							title: '反馈成功!我们将尽快处理',
-							icon: 'no'
+							icon: 'none'
 						});
 						setTimeout(() => {
 							uni.navigateBack();

+ 1 - 0
pages/my/follow.vue

@@ -75,6 +75,7 @@ export default {
 			this.hasMoreFollow = true // 是否有更多关注数据可加载
 			this.followOffset = 0
 			this.followList= []
+			 this.fansList =[]
 			// 加载对应的数据
 			this.loadFollowList();
 

+ 40 - 18
pages/my/my.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="topBody">
 			<!-- <view class="header" :class="{ 'header-isvip': !isRecharge }"> -->
-			<view class="header" >
+			<view class="header">
 				<view class="reserveASeat"></view>
 				<view class="card-box">
 					<view class="card-top">
@@ -39,7 +39,7 @@
 								<image src="@/static/icon/wd_icon_edit.png" mode="widthFix" class="add_icon"></image>
 							</block>
 							<uv-text v-else :text="myinfo.content" class="intro_text two-omit">
-							 
+
 							</uv-text>
 						</view>
 						<view class="bom">
@@ -60,12 +60,12 @@
 								</view>
 							</view>
 							<view class="points-box">
-								<view class="points" @click="isRecharge ? goPage('/pages/vip/M_purchase')  : ''">
+								<view class="points" @click="isRecharge ? goPage('/pages/vip/M_purchase') : ''">
 									<image src="@/static/icon/wd_icon_coin.png" mode=""></image>
 									{{ myinfo.num_gmm | formatNumberToK }}
 									<view class="money-add" v-if="isRecharge">+</view>
 								</view>
-								<view class="points" @click="isRecharge ?goPage('/pages/my/job?type=recharge')  : ''">
+								<view class="points" @click="isRecharge ? goPage('/pages/my/job?type=recharge') : ''">
 									<image src="@/static/icon/coin_cd.png" mode=""></image>
 									{{ myinfo.num_gmd | formatNumberToK }}
 									<view class="money-add" v-if="isRecharge">+</view>
@@ -74,7 +74,7 @@
 						</view>
 					</view>
 					<!-- <view class="card-bom" v-if="isRecharge" @click="goPage('/pages/vip/index')"> -->
-					<view class="card-bom"  @click="isRecharge ? goPage('/pages/vip/index') : ''">
+					<view class="card-bom" @click="isRecharge ? goPage('/pages/vip/index') : ''">
 						<view class="content-box">
 							<image v-if="false" src="@/static/me/icon-vip2.png" mode=""></image>
 							<image v-else-if="0" src="@/static/me/icon-vip1.png" mode=""></image>
@@ -187,7 +187,7 @@
 								<view class="incomplete-bg" style="background: #f8f9fa"></view>
 								<image class="incomplete-bg" v-if="item.status != 1"
 									src="@/static/me/wd_bg_zhizuozhong.png"></image>
-									<image class="incomplete-bg2" v-else-if="item.status == 1" :src="item.image"
+								<image class="incomplete-bg2" v-else-if="item.status == 1" :src="item.image"
 									mode="aspectFill" style="max-height: 520rpx;"></image>
 
 								<view class="maskLayer" v-if="item.status != 1"></view>
@@ -241,8 +241,8 @@
 		<DialogBox ref="DialogBox"></DialogBox>
 		<tabbar-view :tabbars="tabbars" :currentIndex="4" ref="tabbar"></tabbar-view>
 		<!-- SharePopup组件 -->
-		<SharePopup :visible="showShare" :share-url="shareUrl" :share-title="shareTitle" :share-desc="shareDesc"
-			:share-img="shareImg" @close="showShare = false" />
+		<SharePopup :visible="showShare" :userId="userId" :share-title="shareTitle" :share-desc="shareDesc"
+			:share-img="shareImg" view="makeDetail" @close="showShare = false" />
 
 	</view>
 </template>
@@ -290,10 +290,10 @@ export default {
 			isLoading: false,
 			worksList: [],
 			showShare: false,
-			shareUrl: "https://your-share-url.com",
-			shareTitle: "分享标题",
-			shareDesc: "分享描述",
-			shareImg: "https://your-share-image.com/image.jpg",
+			shareTitle: "",
+			shareDesc: "",
+			shareImg: "",
+			userId: 0,
 		};
 	},
 	onLoad(e) {
@@ -307,7 +307,21 @@ export default {
 		// 		}
 		// 	})
 		// }, 200); 
-
+		uni.$on('switchToMyPage', (data) => {
+			if (data.type === 'article') {
+				this.firstLevelNavActiveSwitch(1);
+			} else if (data.type === 'generatingInProgress') {
+				this.firstLevelNavActiveSwitch(0)
+				this.switchTab(1);
+			} else {
+				this.firstLevelNavActiveSwitch(0)
+				this.switchTab(0);
+			}
+		});
+	},
+	onUnload() {
+		// 移除事件监听
+		uni.$off('switchToMyPage');
 	},
 	computed: {
 		...mapState('switchingModule', ['isRecharge'])
@@ -363,11 +377,11 @@ export default {
 			}
 		},
 		goPage(page) {
-		 
-				uni.navigateTo({
-					url: page,
-				});
-		 
+
+			uni.navigateTo({
+				url: page,
+			});
+
 		},
 		loadInfo() {
 			console.log({
@@ -386,9 +400,17 @@ export default {
 				},
 				success: (res) => {
 					console.log("----:", JSON.parse(JSON.stringify(res.data)));
+					if (res.data) {
+
+						this.shareTitle = res.data.nickname
+						this.shareDesc = res.data.content
+						this.shareImg = res.data.avator
+						this.userId = res.data.user_id
+					}
 					if (res.data.need_login == "yes") {
 						// getApp().globalData.skey = "";
 						// getApp().globalData.uuid = "";
+
 						uni.removeStorageSync("wapptoken");
 						uni.redirectTo({
 							url: "/pages/login/login",

+ 581 - 524
pages/my/myStar.vue

@@ -5,7 +5,8 @@
 		</PageHeader>
 		<!-- 星灵基因重组仓弹窗 -->
 		<view class="gender-popup" v-if="state == 0">
-			<NicknamePopup :closeOnClickOverlay="false" title="星灵基因重组仓" subtitle="" class="openContentPopUpWindow" ref="openContentPopUpWindow" @close="goBack()">
+			<NicknamePopup :closeOnClickOverlay="false" title="星灵基因重组仓" subtitle="" class="openContentPopUpWindow"
+				ref="openContentPopUpWindow" @close="goBack()">
 				<template slot="content">
 					<uv-textarea v-model="noteContent" maxlength="200" count autoHeight
 						placeholder="可描述你想要重新赋予Ta的形象、性别、性格、身份、兴趣爱好等(不会展示给其他人,仅你自己知道),示例:有一头波浪状的橙色头发,喜欢运动的阳光男孩..."></uv-textarea>
@@ -22,8 +23,7 @@
 		<!-- 角色展示页面 -->
 		<view class="character-page" v-else-if="state == 1">
 			<view class="character-container">
-				<image :src="starInfo.image || ''" mode="widthFix"
-					class="character-image">
+				<image :src="starInfo.image || ''" mode="widthFix" class="character-image">
 				</image>
 			</view>
 			<view class="bottom-button" @tap="goToSetProfile"> 设置星灵简介 </view>
@@ -141,7 +141,8 @@
 						<image class="female" v-else-if="starInfo.sex_id == 2" src="../../static/me/wd_icon_nv.png"
 							mode="aspectFit">
 						</image>
-						<image class="other" v-else-if="starInfo.sex_id == 3" src="../../static/me/wd_icon_qita.png" mode="aspectFit"></image>
+						<image class="other" v-else-if="starInfo.sex_id == 3" src="../../static/me/wd_icon_qita.png"
+							mode="aspectFit"></image>
 					</view>
 
 					<!-- 人物简介 -->
@@ -191,619 +192,675 @@
 			</view>
 		</uni-popup>
 
-		<SharePopup :visible="showShare" :share-url="shareUrl" :share-title="shareTitle" :share-desc="shareDesc"
-			:share-img="shareImg" @close="showShare = false" />
+		<SharePopup :visible="showShare" :userId="userId" :share-title="shareTitle" :share-desc="shareDesc"
+			:share-img="shareImg" view="makeDetail" @close="showShare = false" />
 	</view>
 </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,
-			shareUrl: "https://your-share-url.com",
-			shareTitle: "分享标题",
-			shareDesc: "分享描述",
-			shareImg: "https://your-share-image.com/image.jpg",
-			maxRetries: 10, // 最大重试次数
-			retryCount: 0,  // 当前重试次数
-			pollingInterval: 30000, // 轮询间隔时间(毫秒)
-			editContent: '',
-		};
-	},
-	onLoad() {
-		this.aIpipeiGetinfo("get");
-	},
-	methods: {
-		...mapMutations('switchingModule', ['setInformation','deleteInformation']),
-		// 返回上一页
-		goBack() {
-			console.log(66);
-			
-			uni.navigateBack({
-				delta: 1
-			});
+	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,
 		},
-		confirmGender() {
-			// 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 = ''
-
+		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() {
+				// 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) => {
+							this.aIpipeiGetinfo({
+								polling: false
+							});
+						}
+					});
+				} else {
+					// 已入驻状态,直接跳转
+					uni.navigateTo({
+						url: '/pages/isLand/homeLand'
+					});
+				}
+			},
+
+			// 提交用户 开始创建的命令
+			apiPeiStar() {
+				if (!this.noteContent) {
+					uni.showToast({
+						title: "请输入匹配条件",
+						icon: "none",
+					});
+					return;
+				}
 				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) => {
-						this.aIpipeiGetinfo({ polling: false });
-					}
-				});
-			} else {
-				// 已入驻状态,直接跳转
-				uni.navigateTo({
-					url: '/pages/isLand/homeLand'
-				});
-			}
-		},
+						setTimeout(() => {
+							if (res.data.str != "开始匹配") {
+								uni.showToast({
+									title: res.data.str,
+									icon: "none",
+									duration: 2000,
+								});
+							}
+							if (res.data.str == "内容不能为空") {
+								this.openContentPopUpWindow();
+								this.state = 0
+								this.apiPeiStar();
+							}
+							if (res.data.str == "开始匹配") {
+								this.aIpipeiGetinfo({
+									polling: true
+								})
 
-		// 提交用户 开始创建的命令
-		apiPeiStar() {
-			if (!this.noteContent) {
-				uni.showToast({
-					title: "请输入匹配条件",
-					icon: "none",
-				});
-				return;
-			}
-			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(() => {
+							}
+
+						}, 3000);
+
+					},
+					fail: (err) => {
+						console.error("请求失败:", err);
+						// 显示错误提示
 						uni.showToast({
-							title: res.data.str,
+							title: "网络请求失败,请重试",
 							icon: "none",
 							duration: 2000,
 						});
-						if (res.data.str == "内容不能为空") {
-							this.openContentPopUpWindow();
-							this.state = 0
-							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: () => {
 
-				},
-			});
+					},
+				});
 
 
-		},
-		// 查询Ai匹配信息
-		aIpipeiGetinfo({ polling }) {
-			// 清除之前的定时器
-			if (this.timeoutId) {
-				clearTimeout(this.timeoutId);
-				this.timeoutId = 0;
-			}
+			},
+			loadInfo() {
+				console.log({
+					uuid: getApp().globalData.uuid,
+					skey: getApp().globalData.skey,
+				});
+				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 } })
-							console.log(666, res);
-							this.setInformation(res.data.info) 
-						} else {
-							res.data.info.tags = []
-							this.deleteInformation()
-						}
-						// 实现状态的判断
-						// 更改状态为 用户还未匹配过 待输入匹配内容
-						if (res.data.str == "没有匹配过" && res.data.info) {
-							this.state = 0
-							setTimeout(() => {
-								this.openContentPopUpWindow();
-							}, 300);
-						}
-						// 更改状态为 用户还匹配成功时 待点击设置心灵简介
-						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;
+				// 发起请求
+				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.str == "没有匹配过" && res.data.info) {
+								this.state = 0
+								setTimeout(() => {
+									this.openContentPopUpWindow();
+								}, 300);
+							}
+							// 更改状态为 用户还匹配成功时 待点击设置心灵简介
+							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,"打开");
-				
-				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();
-		},
+				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,
 
-		// 关闭编辑弹窗
-		closeEditPopup() {
-			this.$refs.editPopup.close();
-		},
+					},
+					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;
+			},
 
-		// 保存编辑内容
-		saveEdit() {
-			this.starInfo.content = this.editContent;
-			this.closeEditPopup();
+			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();
+			},
+
+			// 关闭编辑弹窗
+			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>

+ 3 - 3
pages/my/security.vue

@@ -13,7 +13,7 @@
 
     <!-- 账号安全组 -->
     <view class="group">
-      <view class="item" @click="goPage('/pages/my/editMobile?originalPhoneNumber=' + phoneNumber)">
+      <view class="item"  v-if="false" @click="goPage('/pages/my/editMobile?originalPhoneNumber=' + phoneNumber)">
         <text class="title">手机号</text>
         <view class="right">
           <text class="value">{{ formatPhoneNumber(phoneNumber) || '未绑定' }}</text>
@@ -31,7 +31,7 @@
 
     <!-- 第三方账号组 -->
     <view class="group">
-      <view class="item" @click="bindWechat">
+      <view class="item" @click="bindWechat"  v-if="false">
         <text class="title">微信账号</text>
         <view class="right">
           <text class="value">{{ wechat || '未绑定' }}</text>
@@ -52,7 +52,7 @@
       <view class="item" @click="goPage('/pages/my/DelMemConfirm')">
         <text class="title red">删除用户</text>
         <view class="right">
-          <text class="value red">注销账户</text>
+          <text class="value red" >注销账户</text>
           <image class="arrow" style="width: 30rpx; height: 30rpx;" src="../../static/me/wd_icon_jiantou_red.png"
             mode="widthFix"></image>
         </view>

+ 18 - 26
pages/my/setting.vue

@@ -218,32 +218,24 @@ export default {
           // 检查通知权限
           const areNotificationsEnabled = notificationManager.areNotificationsEnabled();
 
-          if (areNotificationsEnabled) {
-            uni.showToast({
-              title: '通知权限已开启',
-              icon: 'success'
-            });
-          } else {
-            // 引导用户去设置页面开启通知
-            uni.showModal({
-              title: "开启通知",
-              content: "为了及时接收重要消息,请开启通知权限",
-              cancelText: "取消",
-              confirmText: "确定",
-              success: (res) => {
-                if (res.confirm) {
-                  const Intent = plus.android.importClass('android.content.Intent');
-                  const Settings = plus.android.importClass('android.provider.Settings');
-                  const Uri = plus.android.importClass('android.net.Uri');
-
-                  const intent = new Intent();
-                  intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
-                  intent.putExtra(Settings.EXTRA_APP_PACKAGE, main.getPackageName());
-                  main.startActivity(intent);
-                }
-              },
-            });
-          }
+         uni.showModal({
+           title: "通知设置",
+           content: "您可以设置-通知中,去自行选择开启消息通知",
+           cancelText: "取消",
+           confirmText: "确定",
+           success: (res) => {
+             if (res.confirm) {
+               const Intent = plus.android.importClass('android.content.Intent');
+               const Settings = plus.android.importClass('android.provider.Settings');
+               const Uri = plus.android.importClass('android.net.Uri');
+         
+               const intent = new Intent();
+               intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+               intent.putExtra(Settings.EXTRA_APP_PACKAGE, main.getPackageName());
+               main.startActivity(intent);
+             }
+           },
+         });
         } else {
           // iOS
           const UIApplication = plus.ios.import("UIApplication");

+ 3 - 3
pages/my/userHomepage.vue

@@ -123,9 +123,9 @@ export default {
       isLoading: false,
       worksList: [],
       showShare: false,
-      shareTitle: "分享标题",
-      shareDesc: "分享描述",
-      shareImg: "https://your-share-image.com/image.jpg",
+      shareTitle: "",
+      shareDesc: "",
+      shareImg: "",
       userId: 0,
       id: 0,
     };

BIN
static/image/1080x1882.png


BIN
static/image/480x762.png


BIN
static/image/720x1242.png


BIN
static/logo.png