接口调用

api/index.js

@@ -1,5 +1,109 @@
 import { request } from './request'
 const api = {
+	//社交消费-文字/语音/视频结算
+	chat(data){
+		return request({
+			url: 'api/user/chat',
+			method: 'post',
+			data
+		})
+	},
+	//查询用户余额-（用于判断余额是否足够）
+	userBalance(data){
+		return request({
+			url: 'api/user/userBalance',
+			method: 'post',
+			data
+		})
+	},
+	//设置搭讪列表
+	setAccostDefault(data){
+		return request({
+			url: 'api/user/setAccostDefault',
+			method: 'post',
+			data
+		})
+	},
+	//搭讪列表
+	findAccost(data){
+		return request({
+			url: 'api/user/findAccost',
+			method: 'post',
+			data
+		})
+	},
+	//举报
+	report(data){
+		return request({
+			url: 'api/user/report',
+			method: 'post',
+			data
+		})
+	},
+	//文章-点赞
+	zan(data){
+		return request({
+			url: 'api/user/zan',
+			method: 'post',
+			data
+		})
+	},
+	//评论或者回复
+	commentReply(data){
+		return request({
+			url: 'api/user/commentReply',
+			method: 'post',
+			data
+		})
+	},
+	//动态详情
+	articleDetail(data){
+		return request({
+			url: 'api/user/articleDetail',
+			method: 'post',
+			data
+		})
+	},
+	//删除动态
+	userArticleList(data){
+		return request({
+			url: 'api/user/userArticleList',
+			method: 'post',
+			data
+		})
+	},
+	//用户动态列表-分页
+	userArticleList(data){
+		return request({
+			url: 'api/user/userArticleList',
+			method: 'post',
+			data
+		})
+	},
+	//用户陪玩服务列表
+	userSellerServiceList(data){
+		return request({
+			url: 'api/user/userSellerServiceList',
+			method: 'post',
+			data
+		})
+	},
+	//支付订单
+	paymentOrder(data){
+		return request({
+			url: 'api/user/paymentOrder',
+			method: 'get',
+			data
+		})
+	},
+	//会员充值-预下单（拿着单号调用-支付订单）
+	memberCreateOrder(data){
+		return request({
+			url: 'api/user/memberCreateOrder',
+			method: 'post',
+			data
+		})
+	},
 	//会员协议
 	getConfigData(data){
 		return request({
@@ -72,7 +176,7 @@ const api = {
 			data
 		})
 	},
-	//根据字典类型获取字典  学历 education_type 薪资 salary_type 婚姻 marriage_type 居住 live_type 异性-女标签 sex_type_2 星座 constellation_type 异性-男标签 sex_type_1
+	//根据字典类型获取字典 支付方式：CONFIG_PAY_STATUS   1 开启 0关闭   学历 education_type 薪资 salary_type 婚姻 marriage_type 居住 live_type 异性-女标签 sex_type_2 星座 constellation_type 异性-男标签 sex_type_1
 	getDictDataByType(data) {
 		return request({
 			url: 'api/getDictDataByType',

components/dashan.vue

@@ -2,21 +2,21 @@
 	<view>
 		<u-popup v-model="isDashan" mode="center"  border-radius="20" :mask-close-able="false">
 			<view class="dashan">
-				<view class="titles">选择搭讪语<image src="@/static/cha.png"></image></view>
+				<view class="titles">选择搭讪语<image @click="closePopup" src="@/static/cha.png"></image></view>
 				<view class="content">
 					<view class="a">
 						<view class="txt">选择搭讪语：</view>
 						<view class="box">
-							<input type="text" placeholder="请输入" />
+							<input :value="content" @input="inputValue" type="text" :class="isErr?'on':''" placeholder="请输入" />
 						</view>
 					</view>
 					<view class="b">
 						<view class="txt">系统推荐：</view>
-						<view class="list">
-							<view class="item" v-for="i in 5" :class="tabIndex == i?'item-on':''" >
-								<view class="text">哈喽！很高兴认识你，一起嗨皮吧~</view>
-								<view class="anniu anniu-on" v-if="tabIndex == i">默认</view>
-								<view class="anniu" v-else @click="tabItem(i)">设为默认</view>
+						<view class="list" v-if="list && list.length>0">
+							<view class="item" v-for="(a,i) in list" :class="tabIndex == i?'item-on':''" >
+								<view class="text" @click="tabItem(1,i)">{{a.content}}</view>
+								<view class="anniu anniu-on" v-if="a.isDefault == 1">默认</view>
+								<view class="anniu" v-else @click="tabItem(2,i)">设为默认</view>
 							</view>
 						</view>
 					</view>
@@ -36,23 +36,104 @@
 			isDashan: {
 				type: Boolean,
 				default: false
+			},
+			info: {
+				type: Object,
+				default: {}
+			}
+		},
+		watch: {
+			isDashan: function (val, oldVal) {
+			  if(val == true){
+				  this.getList()
+			  }
 			}
 		},
 		data() {
 			return {
-				tabIndex: 1
+				tabIndex: -1,
+				list: [],
+				isErr: false,
+				content: ""
 			}
 		},
 		methods: {
-			tabItem(index) {
-				this.tabIndex = index;
+			//获取搭讪列表
+			async getList() {
+				const { code, data } = await this.$api.findAccost({
+					userId: uni.getStorageSync("userInfo").id
+				}) 
+				if(code == 200){
+					this.list = data;
+				}
+			},
+			//设置默认
+			async toSet(index) {
+				const { code, data } = await this.$api.setAccostDefault({
+					userId: uni.getStorageSync("userInfo").id,
+					id: this.list[index].id
+				}) 
+				if(code == 200){
+					uni.showToast({
+						title: "设置成功"
+					})
+					this.getList();
+				}
+			},
+			//检查次数
+			async userBalance() {
+				const { code, data } = await this.$api.userBalance({
+					userId: uni.getStorageSync("userInfo").id
+				}) 
+				if(code == 200){
+					if(data.wordCoins >=1){
+						this.chat()
+					}
+				}
+			},
+			//发送
+			async chat() {
+				const { code, data } = await this.$api.chat({
+					userId: uni.getStorageSync("userInfo").id,
+					sellerId: this.info.userid,
+					type: 3,
+					message: this.content
+				}) 
+				if(code == 200){
+					uni.$emit("closeSharePopup",false)
+					this.tabIndex = -1;
+					this.content = "";
+					this.isErr = false;
+					uni.showToast({
+						title: "搭讪成功！"
+					})
+				}
+			},
+			tabItem(type,index) {
+				if(type == 1){
+					this.content = this.list[index].content
+					this.tabIndex = index;
+				}else{
+					this.toSet(index);
+				}
+			},
+			inputValue(e){
+				this.tabIndex = -1;
+				this.isErr = false;
+				this.content = e.detail.value
+			},
+			closePopup() {
+				this.tabIndex = -1;
+				this.content = "";
+				this.isErr = false;
+				uni.$emit("closeSharePopup",false)
 			},
 			send() {
-				this.isDashan = false;
-				uni.showModal({
-					title: "搭讪成功！",
-					content: "“你好，在吗？很高兴认识你”"
-				})
+				if(!this.content){
+					this.isErr = true
+					return ;
+				}
+				this.userBalance();
 			}
 		}
 	}
@@ -61,11 +142,12 @@
 <style scoped lang="scss">
 .dashan{
 	width: 670rpx;
-	height: 970rpx;
+	min-height: 270rpx;
 	background: #FFFFFF;
 	border-radius: 20rpx;
 	.fd{
 		margin-top: 50rpx;
+		margin-bottom: 50rpx;
 		.btn{
 			width: 300rpx;
 			text-align: center;
@@ -112,6 +194,9 @@
 				font-weight: 500;
 				font-size: 26rpx;
 				color: #212121;
+				&.on{
+					border-color: #ff0000;
+				}
 			}
 		}
 		.list{
@@ -147,7 +232,6 @@
 						line-height: 50rpx;
 						font-size: 24rpx;
 						color: #FFFFFF;
-						display: none;
 					}
 				}
 				&-on{

components/share.vue

@@ -23,17 +23,17 @@
 						</view>
 					</view>
 					<view class="fd">
-						<view class="btn">取消</view>
+						<view class="btn" @click="closePopup()">取消</view>
 					</view>
 				</template>
 				<template v-if="type==2">
-					<view class="titles">分享<image src="@/static/cha.png"></image></view>
+					<view class="titles">分享<image @click="closePopup()" src="@/static/cha.png"></image></view>
 					<view class="content">
-						<view class="item">
+						<view class="item" @click="appShare('WXSceneSession',1)">
 							<image src="@/static/icon-share-01.png"></image>
 							<view class="txt">微信</view>
 						</view>
-						<view class="item">
+						<view class="item" @click="appShare('web',1)">
 							<image src="@/static/icon-share-04.png"></image>
 							<view class="txt">复制链接</view>
 						</view>
@@ -48,6 +48,10 @@
 	export default {
 		name:"insufficient",
 		props: {
+			info: {
+				type: Object,
+				default: {}
+			},
 			isShare: {
 				type: Boolean,
 				default: false
@@ -62,7 +66,60 @@
 				uni.navigateTo({
 					url: "/pages/users/recharge/index"
 				})
-			}
+			},
+			closePopup() {
+				uni.$emit("closeSharePopup",false)
+			},
+			// APP分享
+			appShare(scene,type){
+				let that = this;
+				if(scene == 'web'){
+					uni.setClipboardData({
+						data: this.$articleShareUrl+this.info.id,
+						success: function () {
+							uni.getClipboardData({
+								success: function (res) {
+									uni.$emit("closeSharePopup",false)
+									uni.showToast({
+										title: "复制成功"
+									})
+								}
+							});
+						}
+					})
+					return ;
+				}
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				uni.share({
+					provider: "weixin",
+					scene: "WXSceneSession",
+					type,
+					href: that.info.href,
+					title: that.info.title,
+					summary: that.info.summary,
+					imageUrl: that.info.imageUrl,
+					success: function(res) {
+						uni.showToast({
+							title: '分享成功',
+							icon: 'success'
+						})
+						uni.$emit("closeSharePopup",false)
+						uni.hideLoading();
+					},
+					fail: function(err) {
+						uni.showToast({
+							title: '分享失败',
+							icon: 'none',
+							duration: 2000
+						})
+						uni.$emit("closeSharePopup",false)
+						uni.hideLoading();
+					}
+				});
+			},
 		}
 	}
 </script>

main.js

@@ -19,6 +19,7 @@ Vue.config.productionTip = false
 
 import api from '@/api/index.js'
 Vue.prototype.$api = api
+Vue.prototype.$articleShareUrl = "https://api.lyiyuan.cn/profile/upload/web/index.html#/pages/dongtai/detail?type=web&id="
 
 App.mpType = 'app'
 const app = new Vue({

manifest.json

@@ -23,7 +23,8 @@
             "Camera" : {},
             "Maps" : {},
             "Payment" : {},
-            "Record" : {}
+            "Record" : {},
+            "Share" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -81,12 +82,20 @@
                         "appkey_android" : "d2e40f882c2fde0f3724791cb82cbd9c"
                     }
                 },
-                "share" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx3024f118e0e78f2f",
+                        "UniversalLinks" : ""
+                    }
+                },
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "appid" : "wx3024f118e0e78f2f",
                         "UniversalLinks" : ""
+                    },
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
                     }
                 }
             },
@@ -151,5 +160,11 @@
     },
     "vueVersion" : "2",
     "locale" : "zh-Hans",
-    "fallbackLocale" : "zh-Hans"
+    "fallbackLocale" : "zh-Hans",
+    "h5" : {
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
+        }
+    }
 }

pages.json

@@ -400,7 +400,7 @@
             "path" : "pages/users/feedback/index",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "意见反馈",
+                "navigationBarTitleText": "匿名举报",
                 "enablePullDownRefresh": false
             }
             

pages/dongtai/add.vue

@@ -71,7 +71,7 @@
 				const { code, data } = await this.$api.publishArticle({
 					userId: uni.getStorageSync("userInfo").id,
 					content: this.content,
-					imgurl: this.imgurl,
+					imgurl: this.imgurl.join(","),
 				})
 				if(code == 200){
 					uni.showToast({

pages/dongtai/detail.vue

@@ -4,55 +4,59 @@
 			<view class="item">
 				<view class="a">
 					<view class="fl">
-						<image src="@/static/nv.png"></image>
+						<image :src="info.faceImage?info.faceImage:info.img"></image>
 						<view class="info">
-							<view class="name">幽默的先生</view>
-							<view class="desc">2024-06-06 11:23</view>
+							<view class="name">{{info.nickname}}</view>
+							<view class="desc">{{info.createTime}}</view>
 						</view>
 					</view>
-					<view class="fr">
-						<image src="@/static/shenglue.png"></image>
+					<view class="fr" v-if="info.userid == userInfo.id" @click="openPage(1)">
+						<image class="del" src="@/static/icon-del.png"></image>
+					</view>
+					<view class="fr" v-else @click="openPage(2)">
+						<image class="jubao" src="@/static/shenglue.png"></image>
 					</view>
 				</view>
-				<view class="b">今天天气真好啊！碧蓝的天空，绿油油的油菜花，空中飘香，远远的山脉看着忽远忽近。</view>
+				<view class="b">{{info.content}}</view>
 				<view class="c">
-					<image mode="aspectFill" src="@/static/1.png"></image>
-					<image mode="aspectFill" src="@/static/2.png"></image>
-					<image mode="aspectFill" src="@/static/3.png"></image>
+					<image mode="aspectFill" v-for="(a,i) in info.imgurl" :key="i" @click="previewImage(i)" :src="a"></image>
 				</view>
 				<view class="d">
 					<view class="fl">
 						<view class="li">
-							<image src="@/static/xiaoxi.png"></image>69
+							<image src="@/static/xiaoxi.png"></image>{{info.pinglun}}
 						</view>
-						<view class="li">
-							<image src="@/static/dianzan.png"></image>896
+						<view class="li" @click="openPage(5)">
+							<image v-if="info.isUserZan == 0" src="@/static/dianzan.png"></image>
+							<image v-else src="@/static/zandin2.png"></image>{{info.zan}}
 						</view>
-						<view class="li">
+						<view class="li" @click="openPage(3)">
 							<image src="@/static/fenxiang.png"></image>分享
 						</view>
 					</view>
-					<view class="fr">搭讪</view>
+					<view class="fr" @click="openPage(4)" v-if="info.userid != userInfo.id">搭讪</view>
 				</view>
 			</view>
 		</view>
-		<view class="dongtai-bd">
-			<view class="title">全部评价（190）</view>
+		<view class="dongtai-bd" v-if="info.comments && info.comments.length> 0">
+			<view class="title">全部评价（{{info.comments.length}}）</view>
 			<view class="list">
-				<view class="item" v-for="i in 3" :key="i">
+				<view class="item" v-for="(a,i) in info.comments" :key="i" >
 					<view class="a">
 						<view class="pic">
-							<image src="@/static/nan.png"></image>
+							<image :src="a.faceImage"></image>
 						</view>
 						<view class="info">
 							<view class="content">
 								<view class="fl">
-									<view class="name">可以叫我鱼大人<text>作者</text></view>
-									<view class="desc">我家猫咪最喜欢的就是晒太阳了~</view>
+									<view class="name">{{a.nickname}}<text v-if="a.userid == info.userid">作者</text></view>
+									<view class="desc">{{a.content}}</view>
 								</view>
 								<view class="zan">
 									<view class="li">
-										<image src="@/static/dianzan.png"></image>896
+										<image src="@/static/dianzan.png"></image>
+										<image src="@/static/zandin2.png"></image>
+										{{a.zan}}
 									</view>
 								</view>
 							</view>
@@ -71,7 +75,8 @@
 												</view>
 												<view class="zan">
 													<view class="li">
-														<image src="@/static/dianzan.png"></image>896
+														<image src="@/static/dianzan.png"></image>
+														<image src="@/static/zandin2.png"></image>896
 													</view>
 												</view>
 											</view>
@@ -87,22 +92,25 @@
 				</view>
 			</view>
 		</view>
-		<view class="dongtai-fd">
+		<view class="dongtai-fd" v-if="type=='app'">
 			<view class="a">
 				<image src="@/static/editor.png"></image>
-				<input type="text" placeholder="留下你精彩的回复" />
+				<input v-model="content" type="text" placeholder="留下你精彩的回复" />
 			</view>
 			<view class="b">
-				<view class="li">
-					<image src="@/static/dianzan.png"></image>896
+				<view class="fa">
+					发送
 				</view>
-				<view class="li">
-					<image src="@/static/xiaoxi.png"></image>69
+				<view class="li" @click="openPage(5)">
+					<image v-if="info.isUserZan == 0" src="@/static/dianzan.png"></image>
+					<image v-else src="@/static/zandin2.png"></image>
+					{{info.zan}}
 				</view>
 			</view>
 		</view>
-		<dashan :isDashan="isDashan"></dashan>
-		<share :isShare="isShare" />
+		<dashan :isDashan="isDashan" :info="info"></dashan>
+		<share :isShare="isShare" :info="info" />
+		<unverified :isPopup="isPopup" />
 	</view>
 </template>
 
@@ -110,9 +118,127 @@
 	export default {
 		data() {
 			return {
+				isPopup: false,
 				isDashan: false,
-				isShare: false
+				isShare: false,
+				type: 'app',
+				id: "",
+				info: {},
+				content: "",
+				userInfo: {},
 			};
+		},
+		onLoad(o) {
+			const that = this;
+			that.id = o.id;
+			that.type = o.type?o.type:'app';
+			that.userInfo = uni.getStorageSync("userInfo")
+			that.getInfo();
+			uni.$on("closeSharePopup",res=>{
+				that.isShare = false;
+				that.isPopup = false;
+				that.isDashan=  false;
+			})
+		},
+		methods: {
+			openPage(index){
+				const that = this;
+				if(this.type == 'web'){
+					return ;
+				}
+				if(that.userInfo.realnameFlag == 0){
+					that.isPopup = true
+				}
+				if(index == 1){
+					uni.showModal({
+						title: "温馨提示",
+						content: "确定删除该动态？",
+						confirmColor: "#000000",
+						success(res){
+							if(res.confirm){
+								that.toDel();
+							}
+						}
+					})
+				}else if(index == 2){
+					uni.navigateTo({
+						url: "/pages/users/feedback/index?type=1&id="+this.id+'&uid='+this.info.userid
+					})
+				}else if(index == 3){
+					this.isShare = true
+				}else if(index == 4){
+					this.isDashan = true
+				}
+			},
+			previewImage(i){
+				uni.previewImage({
+					urls: this.info.imgurl,
+					count: i
+				})
+			},
+			//删除
+			async toDel() {
+				const {code, data} = await this.$api.commentDelete({articleid: this.id, userId: uni.getStorageSync("userInfo").id});
+				if(code == 200){
+					uni.showToast({
+						title: "删除成功"
+					})
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 1
+						})
+					},1000)
+				}
+			},
+			//获取详情
+			async getInfo() {
+				const {code, data} = await this.$api.articleDetail({articleid: this.id, userId: uni.getStorageSync("userInfo").id});
+				if(code == 200){
+					this.info = data
+					this.info.summary = data.content
+					if(data.imgurl){
+						this.info.imgurl = data.imgurl.split(",")
+						console.log(this.info.imgurl)
+					}
+					
+				}
+			},
+			//评论
+			async toCommentReply(replyId) {
+				const {code, data, msg} = await this.$api.commentReply({articleid: this.id, userId: uni.getStorageSync("userInfo").id,content: this.content,replyId});
+				if(code == 200){
+					uni.showToast({
+						title: "发送成功"
+					})
+					setTimeout(()=>{
+						this.getInfo()
+					},2000)
+				}else{
+					uni.showToast({
+						title: msg,
+						icon: "none",
+						position: "bottom"
+					})	
+				}
+			},
+			//点按
+			async toZan(type,status) {
+				const {code, data} = await this.$api.zan({articleid: this.id, userId: uni.getStorageSync("userInfo").id,type, status});
+				if(code == 200){
+					uni.showToast({
+						title: "点赞成功"
+					})
+					setTimeout(()=>{
+						this.getInfo()
+					},2000)
+				}else{
+					uni.showToast({
+						title: msg,
+						icon: "none",
+						position: "bottom"
+					})	
+				}
+			},
 		}
 	}
 </script>
@@ -224,7 +350,11 @@
 				}
 				.fr{
 					width: 32rpx;
-					image{
+					.del{
+						width: 42rpx;
+						height: 42rpx;
+					}
+					.jubao{
 						width: 32rpx;
 						height: 32rpx;
 					}
@@ -402,6 +532,12 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
+			.fa{
+				font-size: 30rpx;
+				color: #000000;
+				width: 80rpx;
+				text-align: left;
+			}
 			.li{
 				display: flex;
 				align-items: center;

pages/dongtai/index.vue

@@ -99,7 +99,7 @@
 					userId: uni.getStorageSync("userInfo").id,
 					type: Number(this.current)+1,
 					limit: 20,
-					pageNum: this.pageNum,
+					page: this.pageNum,
 				})
 				if(code == 200){
 					if(type == 1){

pages/user/index.vue

@@ -166,7 +166,6 @@
 				</view>
 			</view>
 		</view>
-		<unverified :isPopup="isPopup" />
 		<insufficient :isCoins="isCoins" />
 	</view>
 </template>
@@ -229,9 +228,7 @@
 				if(code == 200){
 					this.userInfo = data;
 					uni.setStorageSync("userInfo",data);
-					if(data.realnameFlag == 0){
-						this.isPopup = true
-					}
+					
 				}else{
 					uni.showToast({
 						title: mgs,

pages/users/about/index.vue

@@ -30,6 +30,11 @@
 	}
 </script>
 
-<style lang="scss">
-
+<style scoped lang="scss">
+.content{
+	padding: 25rpx;
+	overflow: hidden;
+	font-size: 28rpx;
+	color: #333;
+}
 </style>

pages/users/center/index.vue

@@ -23,31 +23,31 @@
 			<view class="title" v-if="userInfo.memberflag>=1">您的特权</view>
 			<view class="content" v-if="userInfo.memberflag>=1">
 				<view class="item">
-					<view class="a"><view class="btn">特权1</view><view class="txt">会员专属标识</view></view>
+					<view class="a"><view class="btn">特权1</view><view class="txt">文字语音视频聊天折扣{{list[userInfo.memberflag-1].wordVoiceDiscount}}折</view></view>
 					<view class="b">
 						<image src="@/static/icon-svip.png"></image>
 					</view>
 				</view>
 				<view class="item">
-					<view class="a"><view class="btn">特权2</view><view class="txt">支持查看访客信息</view></view>
+					<view class="a"><view class="btn">特权2</view><view class="txt">每天可领金币{{list[userInfo.memberflag-1].receiveCoins}}枚</view></view>
 					<view class="b">
 						<image src="@/static/icon-svip.png"></image>
 					</view>
 				</view>
 				<view class="item">
-					<view class="a"><view class="btn">特权3</view><view class="txt">文字、语音、视频聊天8折</view></view>
+					<view class="a"><view class="btn">特权3</view><view class="txt">可累积领取金币{{list[userInfo.memberflag-1].totalReceiveCoins}}枚</view></view>
 					<view class="b">
 						<image src="@/static/icon-svip.png"></image>
 					</view>
 				</view>
 				<view class="item">
-					<view class="a"><view class="btn">特权4</view><view class="txt">每天可领10金币，可累计领取1000金币</view></view>
+					<view class="a"><view class="btn">特权4</view><view class="txt">每天免费信息数量{{list[userInfo.memberflag-1].freeMsg}}条</view></view>
 					<view class="b">
 						<image src="@/static/icon-svip.png"></image>
 					</view>
 				</view>
 				<view class="item">
-					<view class="a"><view class="btn">特权5</view><view class="txt">每天免费10条信息、2分钟语音、2分钟视频聊天</view></view>
+					<view class="a"><view class="btn">特权5</view><view class="txt">每天免费信息数量{{list[userInfo.memberflag-1].freeVoice}}分钟</view></view>
 					<view class="b">
 						<image src="@/static/icon-svip.png"></image>
 					</view>
@@ -59,12 +59,12 @@
 					<view class="a">{{a.cycle}}{{a.danwei}}</view>
 					<view class="b">￥<text>{{a.presentPrice}}</text></view>
 					<view class="c">{{a.discount}}折</view>
-					<view class="d">原价￥{{a.presentPrice}}</view>
+					<view class="d">原价￥{{a.originalPrice}}</view>
 					<view class="e">{{a.name}}</view>
 				</view>
 			</scroll-view>
-			<view class="title">会员特权</view>
-			<view class="content">
+			<view class="title" v-if="list && list.length > 0">会员特权</view>
+			<view class="content" v-if="list && list.length > 0">
 				<view class="item">
 					<view class="a"><view class="btn">特权1</view><view class="txt">文字语音视频聊天折扣{{list[tabIndex].wordVoiceDiscount}}折</view></view>
 					<view class="b">
@@ -84,34 +84,30 @@
 					</view>
 				</view>
 				<view class="item">
-					<view class="a"><view class="btn">特权3</view><view class="txt">每天免费信息数量{{list[tabIndex].freeMsg}}条</view></view>
+					<view class="a"><view class="btn">特权4</view><view class="txt">每天免费信息数量{{list[tabIndex].freeMsg}}条</view></view>
 					<view class="b">
 						<image src="@/static/icon-svip.png"></image>
 					</view>
 				</view>
 				<view class="item">
-					<view class="a"><view class="btn">特权4</view><view class="txt">每天免费信息数量{{list[tabIndex].freeVoice}}分钟</view></view>
+					<view class="a"><view class="btn">特权5</view><view class="txt">每天免费信息数量{{list[tabIndex].freeVoice}}分钟</view></view>
 					<view class="b">
 						<image src="@/static/icon-svip.png"></image>
 					</view>
 				</view>
 			</view>
 			<view class="title">支付方式</view>
-			<view class="pay">
-				<view class="item" :class="payIndex == 1?'item-on':''" @click="tabPay(1)">
-					<view class="a"><image src="@/static/wxpay.png"></image>微信支付</view>
-					<view class="b">
-						<image class="img1" src="@/static/icon-check.png"></image>
-						<image class="img2" src="@/static/icon-check-on.png"></image>
-					</view>
-				</view>
-				<view class="item" :class="payIndex == 2?'item-on':''" @click="tabPay(2)">
-					<view class="a"><image src="@/static/zfb.png"></image>支付宝支付</view>
-					<view class="b">
-						<image class="img1" src="@/static/icon-check.png"></image>
-						<image class="img2" src="@/static/icon-check-on.png"></image>
+			<view class="pay" v-if="payInfo && payInfo.length >= 1">
+				<template v-for="(a,i) in payInfo">
+					<view class="item" v-if="a=='wx-1' || a=='ali-1'" :key="i" :class="payIndex == i?'item-on':''" @click="tabPay(i,a)">
+						<view class="a" v-if="a=='wx-1'"><image src="@/static/wxpay.png"></image>微信支付</view>
+						<view class="a" v-if="a=='ali-1'"><image src="@/static/zfb.png"></image>支付宝支付</view>
+						<view class="b">
+							<image class="img1" src="@/static/icon-check.png"></image>
+							<image class="img2" src="@/static/icon-check-on.png"></image>
+						</view>
 					</view>
-				</view>
+				</template>
 			</view>
 			<view class="agreement">
 				<image class="img1" @click="toggleImg()" v-if="isToggle" src="@/static/icon-check-on.png"></image>
@@ -119,8 +115,8 @@
 				请阅读并同意<text @click="openPPage()">《会员协议》</text>
 			</view>
 		</view>
-		<view class="task-fd">
-			<view class="btn">立即支付￥18</view>
+		<view class="task-fd" v-if="payInfo && payInfo.length >= 1">
+			<view class="btn" @click="toCreate()">立即支付￥{{list[tabIndex].presentPrice}}</view>
 		</view>
 	</view>
 </template>
@@ -133,18 +129,21 @@
 				userInfo: {},
 				isToggle: false,
 				tabIndex: 0,
-				payIndex: 1,
+				payIndex: -1,
 				background: {
 					// 导航栏背景图
-					background: 'url(@/static/task-bg.png) center top no-repeat',
+					background: 'url(https://api.lyiyuan.cn/profile/upload/static/task-bg.png) center top no-repeat',
 					// 还可以设置背景图size属性
 					backgroundSize: '100 auto',
 				},
+				payInfo: [],
+				payType: ""
 			};
 		},
 		onReady() {
 			this.getUserInfo();
 			this.getList();
+			this.getConfigData();
 		},
 		methods: {
 			openPPage() {
@@ -155,8 +154,9 @@
 			tabItem(i){
 				this.tabIndex = i;
 			},
-			tabPay(i){
+			tabPay(i,a){
 				this.payIndex = i;
+				this.payType = a
 			},
 			toggleImg() {
 				this.isToggle = !this.isToggle;
@@ -181,13 +181,94 @@
 					this.list = data
 				}
 			},
+			//字典查询
+			async getConfigData() {
+				const that = this;
+				let res1 = await that.$api.getConfigData({dictType: 'CONFIG_PAY_STATUS'});
+				if(res1.data.content){
+					this.payInfo = res1.data.content.split(",");
+					console.log(this.payInfo)
+				}
+				
+			},
+			//创建订单
+			async toCreate() {
+				const that = this;
+				if(this.isToggle == false){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "请选择会员协议"
+					})
+					return ;
+				}
+				if(!this.payType){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "请选择支付方式"
+					})
+					return ;
+				}
+				
+				uni.showLoading({
+					title: "正在支付"
+				})
+				const {code, data, msg} = await that.$api.memberCreateOrder({
+					userId: uni.getStorageSync("userInfo").id,
+					memberId: that.list[that.tabIndex].id
+				})
+				if(code == 200){
+					that.toPay(msg);
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			},
+			//支付
+			async toPay(outTradeNo) {
+				const that = this;
+				const {code, data, msg} = await that.$api.paymentOrder({
+					payType: that.payType =='wx-1'?1:2,
+					outTradeNo
+				})
+				if(code == 200){
+					uni.requestPayment({
+					   provider: that.payType == 'ali-1'?'alipay':'wxpay',
+					   orderInfo: that.payType == 'ali-1'?data.orderInfo:JSON.parse(data.orderInfo), //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+						success: function (res) {
+							uni.showToast({
+								title: "支付成功"
+							})
+							that.getUserInfo();
+							that.getList();
+						},
+						fail: function (err) {
+							console.log('fail:' + JSON.stringify(err));
+						}
+					});
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			},
+			//微信支付
+			toWechat(data){},
+			//微信支付
+			toWechat(data){},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 .task{
-	background: url(@/static/task-bg.png) center top no-repeat;
+	background: url(https://api.lyiyuan.cn/profile/upload/static/task-bg.png) center top no-repeat;
 	background-size: 100% auto;
 	overflow: hidden;
 	min-height: 100vh;

pages/users/feedback/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="add">
 		<view class="add-content">
-			<view class="content">
+			<!-- <view class="content">
 				<view class="title">举报原因</view>
 				<view class="info">
 					<view class="li" :class="tabIndex == 1?'li-on':''" @click="tabItem(1)">
@@ -25,21 +25,21 @@
 						<image class="img1" src="@/static/icon-check.png"></image><image class="img2" src="@/static/icon-check-on.png"></image>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="content">
-				<view class="title">补充说明</view>
+				<view class="title">举报原因</view>
 				<view class="box">
-					<textarea maxlength="200" placeholder="如有必要，请详细描述(200字以内)~"></textarea>
+					<textarea v-model="content" maxlength="200" placeholder="如有必要，请详细描述(200字以内)~"></textarea>
 				</view>
 			</view>
 			<view class="content">
 				<view class="title">上传图片</view>
 				<view class="list">
-					<view class="item">
-						<image class="pic" src="@/static/1.png"></image>
-						<image class="del" src="@/static/fabu-cha.png"></image>
+					<view class="item" v-for="(a,i) in imgurl" :key="i">
+						<image class="pic" :src="a"></image>
+						<image class="del" @click="toDel(i)" src="@/static/fabu-cha.png"></image>
 					</view>
-					<view class="upload">
+					<view class="upload" @click="uploadImg()">
 						<image class="pic" src="@/static/fankui-tianjia.png"></image>
 						<view class="txt">上传图片</view>
 					</view>
@@ -47,13 +47,13 @@
 			</view>
 		</view>
 		<view class="add-fd">
-			<view class="btn">提交</view>
+			<view class="btn" @click="toReg()">提交</view>
 		</view>
 		<u-popup v-model="show" mode="center" border-radius="20" :mask-close-able="true">
 			<view class="feed">
 				<image src="@/static/feed-01.png"></image>
-				<view class="title">反馈提交成功</view>
-				<view class="btn">我知道了</view>
+				<view class="title">提交成功</view>
+				<view class="btn" @click="show = false">我知道了</view>
 			</view>
 		</u-popup>
 	</view>
@@ -64,13 +64,105 @@
 		data() {
 			return {
 				show: false,
-				tabIndex: 1
+				imgurl: [],
+				content: "",
+				reportUserId: "",
+				type: "",
+				tabIndex: 1,
+				id: "",
+				uid: ""
 			};
 		},
+		onLoad(o) {
+			this.type = o.type;
+			this.id = o.id;
+			this.uid = o.uid;
+		},
 		methods: {
+			//上传图片
+			uploadImg() {
+				const that = this
+				uni.chooseImage({
+					count: 9-that.imgurl.length,
+					sizeType: ["original"], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ["album", "camera"],
+					success: (res1) => {
+						console.log(res1)
+						for(var i = 0; i<res1.tempFilePaths.length;i++){
+							uni.uploadFile({
+								name: 'file',
+								url: that.$baseUrl+'/prod-api/common/upload',
+								filePath: res1.tempFilePaths[i],
+								success: (res) => {
+									const {code, fileName, url, msg} = JSON.parse(res.data);
+									if(code == 200){
+										uni.showToast({
+											title: "上传成功"
+										})
+										that.imgurl.push(url)
+									}else{
+										uni.showToast({
+											icon: "error",
+											title: "上传失败"
+										})
+									}
+								},
+								fail: (err) => {
+									console.log(err)
+								}
+							});	
+						}
+					},
+					fail(err){
+						console.log("fail",err)
+					}
+				});
+			},
+			async toReg() {
+				const that = this;
+				if(!that.content){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "举报说明不能为空！"
+					})
+					return ;
+				}
+				if(that.imgurl.length == 0){
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: "请上传图片"
+					})
+					return ;
+				}
+				const { code, data, msg } = await that.$api.report({
+					userId: uni.getStorageSync("userInfo").id,
+					content: that.content,
+					imgurl: that.imgurl.join(","),
+					reportUserId: that.type == 1?that.uid:"",
+					type: that.type,
+					eventid: that.id,
+					reason: ""
+				})
+				if(code == 200){
+					that.imgurl = [];
+					that.content = "";
+					that.show = true;
+				}else{
+					uni.showToast({
+						icon: "none",
+						position: "bottom",
+						title: msg
+					})
+				}
+			},
 			tabItem(index) {
 				this.tabIndex = index;
-			}
+			},
+			toDel(i) {
+				this.imgurl.splice(i,1)
+			},
 		}
 	}
 </script>

pages/users/personal/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="user" :style="{'padding-bottom': current == 2?'0rpx':'130rpx'}">
+	<view class="user">
 		<view class="user-navbar">
 			<u-navbar :title="title" back-icon-color="#333333" :immersive="true" :background="background"></u-navbar>
 		</view>
@@ -9,7 +9,7 @@
 		</view>
 		<view class="user-hd">
 			<view class="a">
-				<view class="title">{{userInfo.realname?userInfo.realname:userInfo.nickname}}</view>
+				<view class="title">{{userInfo.realname?userInfo.nickname:userInfo.nickname}}</view>
 				<view class="vip" v-if="userInfo.memberflag>=1">VIP{{userInfo.memberflag}}</view>
 				<image class="sex" v-if="userInfo.sex ==2" src="@/static/peiwan-nv.png"></image>
 				<image class="sex" v-else src="@/static/peiwan-nan.png"></image>
@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<view class="user-bd" v-if="current == 0">
-			<view class="xiangce" v-if="userInfo.xiangce.length > 0">
+			<view class="xiangce" v-if="userInfo.xiangce && userInfo.xiangce.length > 0">
 				<view class="title">相册
 					<view class="more" v-if="userInfo.xiangce && userInfo.xiangce.length > 0" @click="openPage(7,userInfo.id)">{{userInfo.xiangce.length}}张<image src="@/static/icon-arrow.png"></image></view>
 				</view>
@@ -76,62 +76,59 @@
 		</view>
 		<view class="user-bd" v-if="current==1">
 			<view class="yuewan">
-				<view class="title">约玩项目
-					<view class="location">
-						<image src="@/static/dingwei.png"></image>距离1000.00km
-					</view>
-				</view>
+				<view class="title">约玩项目</view>
 				<view class="list">
-					<view class="item" :class="clickIndex == idx?'item-active':(idx <= 3?'item-on':'')" v-for="idx in 9" :key="idx">
-						<view class="name">K歌</view>
-						<view class="price">158.00起</view>
+					<view class="item" :class="clickIndex == idx?'item-active':(a.type==1?'item-on':'')" v-for="(a,idx) in sellerServiceList" :key="idx">
+						<view class="name">{{a.name}}</view>
+						<view class="price">{{a.price}}起</view>
+					</view>
+					<view class="empty" v-if="isShow">
+						<image src="@/static/empty.png"></image>
+						<view class="txt">暂无数据</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="user-bd" v-if="current==2">
 			<view class="dongtai">
-				<view class="item" v-for="(a,i) in userInfo.sitterServiceList" :key="i" @click="openPage(5,a.id)">
+				<view class="empty" v-if="isShow">
+					<image src="@/static/empty.png"></image>
+					<view class="txt">暂无数据</view>
+				</view>
+				<view class="item" v-for="(a,i) in articleList" :key="i" @click="openPage(5,a.id)">
 					<view class="a">
 						<view class="fl">
-							<image :src="a"></image>
+							<image :src="a.faceImage?a.faceImage:a.img"></image>
 							<view class="info">
-								<view class="name">幽默的先生</view>
-								<view class="desc">2024-06-06 11:23</view>
+								<view class="name">{{a.nickname}}</view>
+								<view class="desc">{{a.createTime}}</view>
 							</view>
 						</view>
-						<view class="fr">
-							<image src="@/static/shenglue.png"></image>
-						</view>
 					</view>
-					<view class="b">今天天气真好啊！碧蓝的天空，绿油油的油菜花，空中飘香，远远的山脉看着忽远忽近。</view>
+					<view class="b">{{a.content}}</view>
 					<view class="c">
-						<image mode="aspectFill" src="@/static/1.png"></image>
-						<image mode="aspectFill" src="@/static/2.png"></image>
-						<image mode="aspectFill" src="@/static/3.png"></image>
+						<image mode="aspectFill" v-for="(b,idx) in a.imgurl" :key="idx" :src="b"></image>
 					</view>
 					<view class="d">
 						<view class="fl">
 							<view class="li">
-								<image src="@/static/xiaoxi.png"></image>69
+								<image src="@/static/xiaoxi.png"></image>{{a.pinglun}}
 							</view>
 							<view class="li">
-								<image src="@/static/dianzan.png"></image>896
-							</view>
-							<view class="li" @click.stop="openPage(2)">
-								<image src="@/static/fenxiang.png"></image>分享
+								<image v-if="a.isUserZan == 0" src="@/static/dianzan.png"></image>
+								<image v-else src="@/static/zandin2.png"></image>{{a.zan}}
 							</view>
 						</view>
-						<view class="fr" @click.stop="openPage(3)">搭讪</view>
 					</view>
 				</view>
 			</view>
+			
 		</view>
 		<view class="user-fd">
 			<view class="item" @click="openPage(1)">编辑资料</view>
 		</view>
 		<dashan :isDashan="isDashan" />
-		<share :isShare="isShare" />
+		<share :isShare="isShare" :info="{}" />
 	</view>
 </template>
 
@@ -143,13 +140,14 @@
 			return {
 				baseUrl: "",
 				userInfo: {},
-				clickIndex: 1,
+				clickIndex: 0,
 				isShare: false,
 				isCollect: false,
 				isDashan: false,
 				isPlay: false,
 				title: "",
 				isScroll: false,
+				isShow: false,
 				background: {
 					// 导航栏背景图
 					background: 'transparent',
@@ -158,7 +156,7 @@
 				statusBarHeight: 0,
 				list:[{'name': '资料'},{'name': '陪玩'},{'name': '动态'}],
 				activeStyle: {'fontSize': '35rpx'},
-				
+				articleList: []
 			};
 		},
 		onPageScroll(e) {
@@ -170,7 +168,7 @@
 				this.title =""
 			}else{
 				const t = e.scrollTop>=44?1:(e.scrollTop/44).toFixed(2)
-				this.title = (this.userInfo.realname?this.userInfo.realname:this.userInfo.nickname)+"主页"
+				this.title = (this.userInfo.realname?this.userInfo.nickname:this.userInfo.nickname)+"主页"
 				this.background = {
 					// 导航栏背景图
 					background: 'rgba(255,255,255,'+t+')',
@@ -185,6 +183,46 @@
 			this.getUserInfo();
 		},
 		methods: {
+			async userSellerServiceList() {
+				const { code, data , msg } = await this.$api.userSellerServiceList({
+					userId: uni.getStorageSync("userInfo").id,
+					sellerId: "",
+					lat: uni.getStorageSync("jingweiInfo").latitude,
+					lon: uni.getStorageSync("jingweiInfo").longitude
+				});
+				if(code == 200){
+					this.sellerServiceList = data.serviceList;
+					this.isShow = data.serviceList.length == 0?true:false;
+				}else{
+					uni.showToast({
+						title: mgs,
+						position: "bottom",
+						icon: "none",
+					})
+				}
+			},
+			async userArticleList() {
+				const { code, data , msg } = await this.$api.userArticleList({userId: uni.getStorageSync("userInfo").id,limit:100,page:1});
+				if(code == 200){
+					let arr = [];
+					if(data.list && data.list.length > 0){
+						data.list.map(a=>{
+							if(a.imgurl){
+								a.imgurl = a.imgurl.split(",")
+							}
+							arr.push(a)
+						})
+					}
+					this.articleList = arr;
+					this.isShow = data.totalCount == 0?true:false;
+				}else{
+					uni.showToast({
+						title: mgs,
+						position: "bottom",
+						icon: "none",
+					})
+				}
+			},
 			async getUserInfo() {
 				const { code, data , msg } = await this.$api.findUserInfo({userId: uni.getStorageSync("userInfo").id});
 				if(code == 200){
@@ -289,6 +327,11 @@
 			},
 			changeTabs(index){
 				this.current = index
+				if(index == 1){
+					this.userSellerServiceList();
+				}else if(index == 2){
+					this.userArticleList();
+				}
 			},
 			toToggle () {
 				this.isPlay = !this.isPlay
@@ -316,7 +359,21 @@
 
 <style scoped lang="scss">
 .user{
+	padding-bottom: 130rpx;
 	overflow: hidden;
+	.empty{
+		padding: 150rpx 0;
+		text-align: center;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #222222;
+		image{
+			display: block;
+			width: 460rpx;
+			height: 400rpx;
+			margin: 0 auto;
+		}
+	}
 	&-pic{
 		width: 100%;
 		image{

unpackage/dist/build/web/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>chunwan</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.ffa5d3f0.js></script><script src=./static/js/index.4f07dffe.js></script></body></html>