no message

api/alumni.js

@@ -25,4 +25,7 @@ export const setRemarkLike = (data) => request(newsUrl + 'remark_like', 'post',
 export const delRemark = (data) => request(newsUrl + 'del_remark', 'post', { ...data },false)
 
 // 帖子详情
-export const alumnInfo = (data) => request(newsUrl + 'info', 'post', { ...data },false)
+export const alumnInfo = (data) => request(newsUrl + 'info', 'post', { ...data },false)
+
+// 自己发布的帖子
+export const alumnMyAlumni = (data) => request(newsUrl + 'my_alumni', 'post', { ...data },false)

api/comment.js

@@ -0,0 +1,11 @@
+import {request} from '../service/ajax.js'
+
+const newsUrl = '/api/comment/'
+// 获取待评价列表
+export const commentWait = (data) => request(newsUrl + 'wait', 'post', { ...data },false)
+// 添加评价
+export const commentCreate = (data) => request(newsUrl + 'create', 'post', { ...data },false)
+// 获取已评价列表
+export const commentMyList = (data) => request(newsUrl + 'my_list', 'post', { ...data },false)
+// 删除评论
+export const commentDel = (data) => request(newsUrl + 'del', 'post', { ...data },false)

api/message.js

@@ -0,0 +1,7 @@
+import {request} from '../service/ajax.js'
+
+const newsUrl = '/api/message/'
+// 消息统计
+export const messageTotal = (data) => request(newsUrl + 'total', 'post', { ...data },false)
+// 消息列表
+export const messageList = (data) => request(newsUrl + 'list', 'post', { ...data },false)

common/css/common.css

@@ -321,6 +321,9 @@ image {
 .b-rad-12{
 	border-radius: 12rpx;
 }
+.b-rad-16{
+	border-radius: 16rpx;
+}
 .b-rad-20{
 	border-radius: 20rpx;
 }
@@ -338,6 +341,9 @@ image {
 .p-16{
 	padding: 16rpx;
 }
+.p-20{
+	padding: 20rpx;
+}
 .p-24{
 	padding: 24rpx;
 }

pages-my/appraise.vue

@@ -12,7 +12,8 @@
 							你对商家满意吗？
 						</view>
 						<view class="align-items-center mb-24" @click="clickShopCheck">
-							<uni-icons v-if="shopCheck" color="#41ABF5" type="checkbox-filled" size="20"></uni-icons>
+							<uni-icons v-if="formData.is_anonymous == 1" color="#41ABF5" type="checkbox-filled"
+								size="20"></uni-icons>
 							<uni-icons v-else color="#ccc" type="circle" size="20"></uni-icons>
 							<view class="ml-2 fs-24 fc-6">
 								匿名提交
@@ -20,103 +21,37 @@
 						</view>
 					</view>
 					<view class="shop-box align-items-center mb-48">
-						<image class="shop-img mr-20" src="../static/img/my/bg.png" mode=""></image>
+						<image class="shop-img mr-20" :src="shopLogo" mode=""></image>
 						<view class="fs-30 fc-3">
-							2024-05-21 01:05 下单
+							{{shopName}}
 						</view>
 					</view>
-					<view class="align-items-center mb-26">
-						<view class="fs-30 fw-600 fc-0 mr-40">
-							总体
+					<view class="align-items-center">
+						<view class="fs-30 fw-600 fc-0 mr-10">
+							评分
 						</view>
-						<uni-rate v-model="formData.rateValueOne" margin="10" active-color="#FF7F00" color="#F1F1F1" />
+						<uni-rate v-model="formData.grade" margin="10" active-color="#FF7F00" color="#F1F1F1" />
 						<view class="fc-FF7F00 fs-28 ml-40">
-							{{formData.rateValueOne == 1?'非常差':formData.rateValueOne == 2?'一般':formData.rateValueOne == 3?'好':formData.rateValueOne == 4?'很棒':'非常棒'}}
-						</view>
-					</view>
-					<view class="align-items-center mb-60">
-						<view class="fs-30 fw-600 fc-0 mr-40">
-							包装
-						</view>
-						<uni-rate v-model="formData.rateValueTwo" margin="10" active-color="#FF7F00" color="#F1F1F1" />
-						<view class="fc-FF7F00 fs-28 ml-40">
-							{{formData.rateValueTwo == 1?'非常差':formData.rateValueTwo == 2?'一般':formData.rateValueTwo == 3?'好':formData.rateValueTwo == 4?'很棒':'非常棒'}}
-						</view>
-					</view>
-					<view class="fs-36 fw-600 fc-3 mb-24">
-						你对商品满意吗？
-					</view>
-					<view class="goods-box align-items-center">
-						<image class="goods-img mr-20" src="../static/img/my/bg.png" mode=""></image>
-						<view class="">
-							<view class="mb-16 fs-30 fc-3">
-								小炒肉
-							</view>
-							<view class="align-items-center">
-								<uni-rate v-model="formData.rateValueThree" margin="10" active-color="#FF7F00"
-									color="#F1F1F1" />
-								<view class="fc-FF7F00 fs-28 ml-40">
-									{{formData.rateValueThree == 1?'非常差':formData.rateValueThree == 2?'一般':formData.rateValueThree == 3?'好':formData.rateValueThree == 4?'很棒':'非常棒'}}
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="bgc-f p-24 b-rad-20 mb-18 box-sizing-border">
-					<view class="flex-justify-space mb-24">
-						<view class="fs-36 fw-600 fc-3">
-							你对骑手满意吗？
-						</view>
-						<view class="fs-24 fc-6">
-							已对骑手匿名
-						</view>
-					</view>
-					<view class="rider-box align-items-center mb-50">
-						<image class="rider-img mr-18" src="../static/img/my/bg.png" mode=""></image>
-						<view class="">
-							<view class="mb-4 fs-30 fc-0">
-								王欢
-							</view>
-							<view class="fc-6 fs-24">
-								5月21日01:15左右送达
-							</view>
-						</view>
-					</view>
-					<view class="rider-rate align-items-center">
-						<view
-							class="rider-rate-but mr-18 scroll-view-css align-items-center flex-justify-center b-rad-200"
-							:class="formData.riderRate?'bgc-F6F6F6':'bgc-ECF7FE'" @click="formData.riderRate = false">
-							<image v-if="formData.riderRate" class="rider-rate-img mr-8"
-								src="@/static/img/my/bmy-no.png" mode=""></image>
-							<image v-else class="rider-rate-img mr-8" src="@/static/img/my/bmy-ok.png" mode=""></image>
-							<view class="fs-30" :class="formData.riderRate?'fc-0':'fc-41ABF5'">
-								不满意
-							</view>
-						</view>
-						<view class="rider-rate-but scroll-view-css align-items-center flex-justify-center b-rad-200"
-							:class="formData.riderRate?'bgc-ECF7FE':'bgc-F6F6F6'" @click="formData.riderRate = true">
-							<image v-if="formData.riderRate" class="rider-rate-img mr-8" src="@/static/img/my/my-ok.png"
-								mode=""></image>
-							<image v-else class="rider-rate-img mr-8" src="@/static/img/my/my-no.png" mode=""></image>
-							<view class="fs-30" :class="formData.riderRate?'fc-41ABF5':'fc-0'">
-								满意
-							</view>
+							{{formData.grade == 1?'非常差':formData.grade == 2?'一般':formData.grade == 3?'好':formData.grade == 4?'很棒':'非常棒'}}
 						</view>
 					</view>
 				</view>
 				<view class="bgc-f p-24 b-rad-20 mb-18 box-sizing-border">
 					<view class="fs-36 fw-600 fc-3 mb-8">
-						请说说你的评价
+						请输入你的评价内容
 					</view>
 					<view class="textarea-box">
-						<textarea placeholder-style="color:#ccc" auto-height maxlength='100' placeholder="请输入" />
+						<textarea v-model="formData.content" placeholder-style="color:#ccc" auto-height maxlength='100'
+							placeholder="请输入" />
 					</view>
 					<view class="up-img-box align-items-center flex-wrap-wrap">
-						<view class="up-img" v-for="(itme, index) in imgList" :key="index">
-							<image class="img" src="../static/img/my/bg.png" mode=""></image>
-							<uni-icons @click="deleteImg(index)" class="delete-icons" color="#000" type="clear" size="20"></uni-icons>
+						<view class="up-img" v-for="(item, index) in formData.images" :key="index">
+							<image class="img" :src="item" mode=""></image>
+							<uni-icons @click="deleteImg(index)" class="delete-icons" color="#000" type="clear"
+								size="20"></uni-icons>
 						</view>
-						<view class="add-img-box flex-direction flex-justify-center align-items-center bgc-F6F6F6">
+						<view @click="upImg" v-if="formData.images.length<= 5"
+							class="add-img-box flex-direction flex-justify-center align-items-center bgc-F6F6F6">
 							<image class="add-img" src="@/static/img/my/sc.png" mode=""></image>
 							<view class="fs-24 fc-9">
 								上传照片
@@ -130,7 +65,8 @@
 			</view>
 		</scroll-view>
 		<view class="bot-box bgc-f">
-			<view class="bot-but fc-f fs-32 text-align-center" :class="formType?'bgc-4FB3EF':'bgc-B3DDFB'">
+			<view class="bot-but fc-f fs-32 text-align-center" :class="formType?'bgc-4FB3EF':'bgc-B3DDFB'"
+				@click="submit">
 				提交评价
 			</view>
 		</view>
@@ -138,30 +74,83 @@
 </template>
 
 <script>
+	import {
+		commentCreate
+	} from '@/api/comment.js'
+	import tools from '@/service/tools';
+	import {
+		upLoadingFileOss
+	} from "@/service/upLoadingFile.js"
 	export default {
 		components: {},
 		data() {
 			return {
-				formType: false,
-				shopCheck: false,
+				formType: true,
 				formData: {
-					rateValueOne: 1, //总体
-					rateValueTwo: 1, //包装
-					rateValueThree: 1, //商品
-					riderRate: false, //骑手评价
-					rate: '',
-					imgList: []
+					grade: 5, //总体
+					is_anonymous: 0, //匿名
+					content: '',
+					images: [],
+					order_id: ''
 				},
+				shopName: '',
+				shopLogo: ''
 			};
 		},
-		onLoad(data) {},
+		onLoad(data) {
+			console.log(data);
+			if (data) {
+				this.formData.order_id = data.orderId
+				this.shopName = data.shopName
+				this.shopLogo = data.shopLogo
+			}
+		},
 		mounted() {},
 		methods: {
+			submit() {
+				commentCreate(this.formData).then((res) => {
+					if (res.code == 1) {
+						tools.success(res.msg)
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 1000)
+					} else {
+						tools.error(res.msg)
+					}
+				})
+			},
 			deleteImg(index) {
-				this.formData.imgList.splice(index, 1)
+				this.formData.images.splice(index, 1)
+			},
+			upImg() {
+				uni.chooseImage({
+					count: 6,
+					sizeType: ["compressed", "camera"],
+					sourceType: ["album", "camera"],
+					success: (res) => {
+						res.tempFiles.forEach((file) => {
+							this.uploadingFile(file);
+						})
+					}
+				})
+			},
+			uploadingFile(file) {
+				upLoadingFileOss(file.path).then((res) => {
+					if (res) {
+						this.formData.images.push(res)
+					} else {
+						tools.error('图片上传失败')
+					}
+				})
 			},
 			clickShopCheck() {
-				this.shopCheck = !this.shopCheck
+				if (this.formData.is_anonymous == 0) {
+					this.formData.is_anonymous = 1
+				} else {
+					this.formData.is_anonymous = 0
+				}
 			},
 			scrolltolower() {
 				console.log('触底');
@@ -232,7 +221,8 @@
 			height: 100%;
 			border-radius: 4rpx;
 		}
-		.delete-icons{
+
+		.delete-icons {
 			position: absolute;
 			right: 0;
 			top: 0;

pages-my/comment.vue

@@ -1,60 +1,108 @@
 <template>
 	<view class="flex-common-css bgc-f">
-		<Nav title="评论" titleColor="#333" bgckgroundBox='#fff'></Nav>
-		<scroll-view :scroll-y="true" class="scroll-view-css">
+		<Nav :title="navTitle" titleColor="#333" bgckgroundBox='#fff'></Nav>
+		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
 			<view class="content-box box-border-box">
-				<view class="item-box display-flex mb-26" v-for="(item,index) in 2">
-					<image class="item-img mr-16 flex-shrink0" src="../static/img/my/user-img.png" mode=""></image>
+				<view class="item-box display-flex mb-26" v-for="(item,index) in listData">
+					<image class="item-img mr-16 flex-shrink0" :src="item.head_img" mode=""></image>
 					<view class="item-right flex-justify-space">
 						<view class="common-view-css mr-46">
 							<view class="mb-4 fc-3 fs-28">
-								恒生科技和半导体
+								{{item.nickname}}
 							</view>
 							<view class="fs-24 fc-9 mb-16">
-								1小时前
+								{{item.created_date}}
 							</view>
 							<view class="fs-30 fc-3">
-								正常的很
+								{{item.msg}}
 							</view>
 						</view>
-						<image class="right-img" src="../static/img/my/bg.png" mode=""></image>
+						<image class="right-img" :src="item.image[0]" mode=""></image>
 					</view>
 				</view>
 			</view>
+			<view v-if="listData.length === 0" class="scroll-view-css">
+				<EnBlank :customSrc='true'>
+					<template v-slot:blankImg>
+						<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
+					</template>
+				</EnBlank>
+			</view>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import EnBlank from "@/components/en-utils/en-blank/en-blank";
+	import {
+		messageList
+	} from "@/api/message.js"
 	export default {
-		components: {},
+		components: {EnBlank},
 		data() {
-			return {};
+			return {
+				navTitle: '',
+				listData: [],
+				page: 1,
+				total:0
+			};
+		},
+		onLoad(data) {
+			if (data) {
+				this.messageList(data.type)
+				if (data.type == 1) {
+					this.navTitle = '系统消息'
+				} else if (data.type == 2) {
+					this.navTitle = '评论'
+				} else {
+					this.navTitle = '点赞'
+				}
+			}
 		},
-		onLoad(data) {},
 		mounted() {},
 		methods: {
-			
+			scrolltolower() {
+				if(this.listData.length < this.total){
+					this.page += 1;
+					this.messageList();
+				}
+			},
+			messageList(type) {
+				messageList({
+					type: type,
+					page: this.page
+				}).then((res) => {
+					if (res.code == 1) {
+						if (res.data.items.length > 0) {
+							this.listData.push(...res.data.items)
+							this.total = res.data.total;
+						}
+					}
+				})
+			}
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-.content-box{
-	padding: 24rpx 24rpx 0;
-}
-.item-img{
-	width: 80rpx;
-	height: 80rpx;
-}
-.item-right{
-	width: 100%;
-	padding: 0 0 24rpx 0;
-	border-bottom: 2rpx solid #F9F9F9;
-}
-.right-img{
-	width: 140rpx;
-	height: 140rpx;
-	border-radius: 12rpx;
-}
-</style>
+	.content-box {
+		padding: 24rpx 24rpx 0;
+	}
+
+	.item-img {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.item-right {
+		width: 100%;
+		padding: 0 0 24rpx 0;
+		border-bottom: 2rpx solid #F9F9F9;
+	}
+
+	.right-img {
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 12rpx;
+	}
+</style>

pages-my/feedback.vue

@@ -144,6 +144,7 @@
 		height: 152rpx;
 		border: 1px dashed #ccc;
 		border-radius: 4rpx;
+		margin: 0 0 10rpx 0;
 
 		.add-img {
 			width: 56rpx;

pages-my/info-centre.vue

@@ -57,31 +57,48 @@
 </template>
 
 <script>
+	import {
+		messageTotal
+	} from "@/api/message.js"
 	export default {
 		components: {},
 		data() {
 			return {
 				infoNumOne: 0,
-				infoNumTwo: 1,
-				infoNumThree: 100
+				infoNumTwo: 0,
+				infoNumThree: 0
 			};
 		},
 		onLoad(data) {},
-		mounted() {},
+		mounted() {
+			this.messageTotal()
+		},
 		methods: {
+			messageTotal() {
+				messageTotal().then((res) => {
+					if(res.code == 1) {
+						this.infoNumOne = res.data.system_count
+						this.infoNumTwo = res.data.remark_count
+						this.infoNumThree = res.data.like_count
+					}
+				})
+			},
 			goToUrl(type) {
-				if(type === 1) {
+				if (type === 1) {
 					// 评论
 					uni.navigateTo({
-						url: '/pages-my/comment'
+						url: `/pages-my/comment?type=` + 2
 					})
-				}else if(type === 2) {
+				} else if (type === 2) {
 					// 点赞
 					uni.navigateTo({
-						url: '/pages-my/praise'
+						url: `/pages-my/comment?type=` + 3
 					})
-				}else {
+				} else {
 					// 系统消息
+					uni.navigateTo({
+						url: `/pages-my/comment?type=` + 1
+					})
 				}
 			},
 			scrolltolower() {
@@ -92,16 +109,18 @@
 </script>
 
 <style lang="scss" scoped>
-.content-box{
-	padding: 32rpx 32rpx 0;
-}
-.left-img{
-	width: 112rpx;
-	height: 112rpx;
-}
-.right{
-	padding: 0 10rpx;
-	height: 32rpx;
-	line-height: 32rpx;
-}
-</style>
+	.content-box {
+		padding: 32rpx 32rpx 0;
+	}
+
+	.left-img {
+		width: 112rpx;
+		height: 112rpx;
+	}
+
+	.right {
+		padding: 0 10rpx;
+		height: 32rpx;
+		line-height: 32rpx;
+	}
+</style>

pages-my/my-appraise.vue

@@ -11,16 +11,16 @@
 			</view>
 		</view>
 		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
-			<view class="list-box">
+			<view class="list-box" v-if="tabNum == 0">
 				<view class="item-box bgc-f b-rad-20 mb-20" v-for="(item,index) in itemData" :key="index">
 					<view class="fw-600 fs-32 fc-3 mb-16">
-						{{item.name}}
+						{{item.shop_name}}
 					</view>
 					<view class="goods-box align-items-center mb-24">
-						<image class="goods-img mr-16" src="../static/img/my/bg.png" mode=""></image>
+						<image class="goods-img mr-16" :src="item.shop_logo" mode=""></image>
 						<view class="">
 							<view class="mb-8 fs-24 fc-6">
-								2024-05-21 01:05 下单
+								{{item.created_date}} 下单
 							</view>
 							<view class="fc-FF7F00 fs-24">
 								你个这次外卖体验打多少分吗？
@@ -28,46 +28,158 @@
 						</view>
 					</view>
 					<view class="flex-justify-end">
-						<view class="fc-41ABF5 fs-28 item-but" @click="goToUrl">
+						<view class="fc-41ABF5 fs-28 item-but" @click="goToUrl(item)">
 							评价
 						</view>
 					</view>
 				</view>
 			</view>
+			<view class="list-box" v-else>
+				<view class="item-box bgc-f p-24 box-border-box display-flex b-rad-20 mb-20" v-for="(itemTwo,indexTwo) in itemData">
+					<image class="item-head-img flex-shrink0 b-rad-12 mr-16" :src="itemTwo.shop_logo" mode="">
+					</image>
+					<view class="item-r-box flex-1">
+						<view class="item-name align-items-center flex-justify-space mb-8">
+							<view class="item-name-t fs-32 fc-3 fw-600 text-overflow-ellipsis-one">
+								{{itemTwo.shop_name}}
+							</view>
+							<view class="fs-24 fc-9">
+								{{itemTwo.created_date}}
+							</view>
+						</view>
+						<view class="align-items-center mb-12">
+							<view class="fs-24 fc-9">
+								商家：
+							</view>
+							<uni-rate class="mr-4" size="12" :value="itemTwo.grade" active-color="#FF7F00" />
+						</view>
+						<view class="text-overflow-ellipsis-t fs-28 fc-3 mb-20">
+							{{itemTwo.content}}
+						</view>
+						<view class="item-img-box mb-20 align-items-center flex-wrap-wrap">
+							<image class="b-rad-12" v-for="imgUrl in itemTwo.images" :src="imgUrl" mode="aspectFill"
+								:class="itemTwo.images.length==1?'item-img-one':itemTwo.images.length==2?'item-img-two':'item-img-three'">
+							</image>
+						</view>
+						<view class="merchant-hf-box bgc-F3F4F6 p-20 box-border-box b-rad-16" v-if="itemTwo.shop_reply">
+							<view class="align-items-center flex-justify-space mb-10">
+								<view class="fs-24 fc-6">
+									商家回复
+								</view>
+								<view class="fs-20 fc-9">
+									{{itemTwo.reply_time}}
+								</view>
+							</view>
+							<view class="fs-24 fc-6">
+								{{itemTwo.shop_reply}}
+							</view>
+						</view>
+						<view class="but-box align-items-center flex-justify-end">
+							<uni-icons class="fc-9 mr-10 fs-28" type="trash"></uni-icons>
+							<view class="fs-28 fc-3 mr-10" @click="del(itemTwo.id)">
+								删除
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<EnBlank :customSrc='true' v-if="itemData.length <= 0">
+				<template v-slot:blankImg>
+					<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
+				</template>
+			</EnBlank>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import {
+		commentWait,
+		commentMyList,
+		commentDel
+	} from '@/api/comment.js'
+	import EnBlank from "@/components/en-utils/en-blank/en-blank";
+	import tools from '@/service/tools';
 	export default {
-		components: {},
+		components: {
+			EnBlank
+		},
 		data() {
 			return {
 				tabNum: 0,
-				tabOneNum: 0,
-				tabTwoNum: 0,
-				itemData: [{
-					name: '猪油拌饭猪油拌（回兴店）'
-				}]
+				// tabOneNum: 0,
+				// tabTwoNum: 0,
+				tabList: ['待评价', '已评价'],
+				itemData: [],
+				page: 1
 			};
 		},
 		computed: {
-			tabList() {
-				return ['待评价(' + this.tabOneNum + ')', '已评价(' + this.tabTwoNum + ')'];
-			}
+			// tabList() {
+			// 	return ['待评价(' + this.tabOneNum + ')', '已评价(' + this.tabTwoNum + ')'];
+			// }
+		},
+		onShow() {
+			this.getListData()
 		},
 		onLoad(data) {},
 		mounted() {},
 		methods: {
+			del(id) {
+				commentDel({id: id}).then((res) => {
+					if(res.code == 1) {
+						tools.success(res.msg)
+						this.getListData()
+					}else {
+						tools.error(res.msg)
+					}
+				})
+			},
 			tabStitle(index) {
+				if (this.tabNum == index) {
+					return
+				}
 				this.tabNum = index
+				this.getListData()
+			},
+			getListData() {
+				this.itemData = []
+				this.page = 1
+				if (this.tabNum == 0) {
+					this.commentWait()
+				} else {
+					this.commentMyList()
+				}
 			},
 			scrolltolower() {
 				console.log('触底');
 			},
-			goToUrl() {
+			goToUrl(item) {
 				uni.navigateTo({
-					url:'/pages-my/appraise'
+					url: `/pages-my/appraise?orderId=` + item.order_id + '&shopName=' + item.shop_name + '&shopLogo=' + item.shop_logo
+				})
+			},
+			commentWait() {
+				// 获取待评价列表
+				commentWait({
+					page: this.page
+				}).then((res) => {
+					if (res.code == 1) {
+						if (res.data.items.length > 0) {
+							this.itemData.push(...res.data.items)
+						}
+					}
+				})
+			},
+			commentMyList() {
+				commentMyList({
+					page: this.page
+				}).then((res) => {
+					if (res.code == 1) {
+						if (res.data.items.length > 0) {
+							this.itemData.push(...res.data.items)
+						}
+					}
 				})
 			}
 		},
@@ -109,4 +221,35 @@
 		border: 2rpx solid #41ABF5;
 		border-radius: 200rpx;
 	}
+	.item-head-img {
+		width: 80rpx;
+		height: 80rpx;
+	}
+	
+	.item-name-t {
+		max-width: 348rpx;
+	}
+	.item-img-box {
+		width: calc(100% + 6rpx);
+	}
+	.item-img-one {
+		width: 360rpx;
+		height: 360rpx;
+	}
+	
+	.item-img-two {
+		width: 276rpx;
+		height: 276rpx;
+		margin: 0 6rpx 0 0;
+	}
+	
+	.item-img-three {
+		width: 182rpx;
+		height: 182rpx;
+		margin: 0 6rpx 6rpx 0;
+	}
+	.but-box{
+		padding: 24rpx 0 0 0;
+		border-top: 2rpx solid #F9F9F9;
+	}
 </style>

pages-my/my-publish.vue

@@ -3,66 +3,67 @@
 		<Nav title="我的发布" titleColor="#333" bgckgroundBox='#fff'></Nav>
 		<scroll-view :scroll-y="true" class="scroll-view-css content-box box-sizing-border"
 			@scrolltolower="scrolltolower">
+			<view v-if="listData.length === 0" class="scroll-view-css">
+				<EnBlank :customSrc='true'>
+					<template v-slot:blankImg>
+						<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
+					</template>
+				</EnBlank>
+			</view>
 			<view class="item-box box-sizing-border b-rad-20 mb-20 bgc-f flex-justify-space"
 				v-for="(item,index) in listData" :key="index" @click="goToUrl(item)">
-				<image class="item-head-img flex-shrink0 b-rad-50 mr-16" src="../static/img/my/user-img.png"
-					mode="aspectFill"></image>
+				<image class="item-head-img flex-shrink0 b-rad-50 mr-16" :src="item.head_img" mode="aspectFill"></image>
 				<view class="itme-right common-view-css">
 					<view class="item-name flex-justify-space mb-16">
 						<view class="">
 							<view class="mb-4 fc-3 fs-28">
-								恒生科技和半导体
+								{{item.nickname}}
 							</view>
 							<view class="fs-24 fc-9">
-								1小时前
+								{{item.created_date}}
 							</view>
 						</view>
 						<view class="align-items-center">
 							<image class="rd-img mr-8" src="@/static/img/my/rd.png" mode=""></image>
 							<view class="fs-26 fc-9">
-								125
+								{{item.heat}}
 							</view>
 						</view>
 					</view>
 					<view class="text-overflow-ellipsis-t fs-30 fc-3 mb-16">
-						欢迎打脸，科技类型很顽强，不是刚刚说1 1吧，换着领涨，这个季节玩什么光伏储白 酒，普
+						{{item.content}}
 					</view>
 					<view class="item-img-box mb-20 align-items-center flex-wrap-wrap">
-						<image class="b-rad-12" v-for="imgUrl in item.img" :src="imgUrl" mode="aspectFill"
-							:class="item.img.length==1?'item-img-one':item.img.length==2?'item-img-two':'item-img-three'">
+						<image class="b-rad-12" v-for="imgUrl in item.image" :src="imgUrl" mode="aspectFill"
+							:class="item.image.length==1?'item-img-one':item.image.length==2?'item-img-two':'item-img-three'">
 						</image>
 					</view>
 					<view class="align-items-center mb-40">
 						<view class="label-box align-items-center mr-20 b-rad-200 bgc-F2F2F2">
 							<image class="wz mr-8" src="@/static/img/my/wz.png" mode=""></image>
 							<view class="fs-24 fc-9">
-								重庆工商职业学校
+								{{item.school_name}}
 							</view>
 						</view>
 						<view class="label-box align-items-center b-rad-200 bgc-F2F2F2">
 							<image class="wz mr-8" src="@/static/img/my/ht.png" mode=""></image>
 							<view class="fs-24 fc-9">
-								买卖闲置
+								{{item.topic_name}}
 							</view>
 						</view>
 					</view>
 					<view class="flex-justify-space">
-						<view class="align-items-center">
-							<image class="but-icons mr-8" src="@/static/img/my/fx.png" mode=""></image>
+						<view class="align-items-center" @click.stop="handUp(1,item)">
+							<uni-icons class="mr-8" type="hand-up" size="22"
+								:color="item.is_like==1?'#FD5C02':'#999'"></uni-icons>
 							<view class="fs-24 fc-9">
-								分享
+								{{item.like}}
 							</view>
 						</view>
-						<view class="align-items-center">
-							<image class="but-icons mr-8" src="@/static/img/my/z.png" mode=""></image>
-							<view class="fs-24 fc-9">
-								12
-							</view>
-						</view>
-						<view class="align-items-center">
+						<view class="align-items-center" @click.stop="openMsg(item,0)">
 							<image class="but-icons mr-8" src="@/static/img/my/hf.png" mode=""></image>
 							<view class="fs-24 fc-9">
-								16
+								{{item.remark}}
 							</view>
 						</view>
 						<uni-icons color="#999999" type="trash" size="20"></uni-icons>
@@ -70,47 +71,285 @@
 				</view>
 			</view>
 		</scroll-view>
-		<movable-area class="add-box">
+		<movable-area class="add-box" v-show="false">
 			<movable-view direction="all" y="300">
 				<view class="add-but b-rad-50 text-align-center" @click="addInfo()">
 					<uni-icons type="plusempty" color="#fff" size="30"></uni-icons>
 				</view>
 			</movable-view>
 		</movable-area>
+		<uni-popup ref="popmsg" type="bottom">
+			<view class="pop-box pop-msg box-border-box p-24">
+				<!-- 输入框 -->
+				<view class="pop-input" v-if="isShowIpnut">
+					<view class="head-pop flex-justify-space align-items-center mb-24 box-border-box p-24">
+						<view class="fs-28 fw-600 fc-41ABF5"></view>
+						<view class="fs-36 fc-0 fw-600">评论</view>
+						<uni-icons @click.stop="closeInput()" type="closeempty" size="24"></uni-icons>
+					</view>
+					<view class="scroll-view-css">
+						<view class="bgc-f box-border-box p-32">
+							<view class="fs-34 fw-600 mb-20">评论</view>
+							<textarea v-model="msgData.content" maxlength="100" class=" fs-24"
+								placeholder='友善评论，文明发言'></textarea>
+						</view>
+					</view>
+					<view class="box-border-box p-24">
+						<view class="save-box" @click.stop="save()">评论</view>
+					</view>
+
+				</view>
+				<!-- ----- -->
+				<view class="head-pop flex-justify-space align-items-center mb-24">
+					<view class=""></view>
+					<view class="fs-36 fc-0 fw-600">评论内容</view>
+					<uni-icons @click.stop="closeMsg()" type="closeempty" size="24"></uni-icons>
+				</view>
+
+				<view v-if="remarkData.list.length === 0" class="scroll-view-css">
+					<EnBlank :customSrc='true'>
+						<template v-slot:blankImg>
+							<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
+						</template>
+					</EnBlank>
+				</view>
+
+				<view v-else class="scroll-view-css box-border-box plr-24">
+					<view class="list-box flex-justify-space" v-for="(item,i) in remarkData.list" :key="i">
+						<image class="list-box-img" :src="item.head_img" mode="scaleToFill"></image>
+						<view class="flex-1 p-b-20">
+							<view class=" flex-justify-space">
+								<view class=" b-b-F9F9F9 mr-20">
+									<view class="fs-28 fw-400 fc-9 mb-8 align-items-center">
+										{{item.nickname}}
+										<span v-if="item.is_author == 1"
+											class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
+										<view class="ml-10" v-if="item.is_self == 1" @click="delInfo(item)">
+											<uni-icons type="trash" size="18"></uni-icons>
+										</view>
+
+									</view>
+									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item)">
+										{{item.content}}
+									</view>
+									<view class="fs-24 fw-400 fc-9 mb-8">{{item.created_date}}</view>
+								</view>
+								<view class="display-flex" @click.stop="handUp(2,item)">
+									<uni-icons type="hand-up" size="20"
+										:color="item.is_like==1?'#FD5C02':'#999'"></uni-icons>
+									<view class="fs-24 fw-400 mt-5" :class="item.is_like==1?'fc-FD5C02':'fc-9'">
+										{{item.like}}
+									</view>
+								</view>
+							</view>
+							<view v-if="item.isOpen" class="fs-24 fc-6 text-align-center mb-12"
+								@click="openReply(1,item)">展开更多评论</view>
+							<!-- 回复 -->
+							<view class="mb-16" v-if="item.replyList.length > 0">
+								<view class="list-box flex-justify-space" v-for="(info,index) in item.replyList"
+									:key="index">
+									<image class="list-box-img" :src="info.head_img" mode="scaleToFill"></image>
+									<view class="flex-1">
+										<view class=" flex-justify-space">
+											<view class=" b-b-F9F9F9 mr-20">
+												<view class="fs-28 fw-400 fc-9 mb-8 align-items-center">
+													{{info.nickname}}
+													<span v-if="info.is_author == 1"
+														class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
+													<view class="ml-10" v-if="info.is_self == 1" @click="delInfo(info)">
+														<uni-icons type="trash" size="18"></uni-icons>
+													</view>
+												</view>
+												<view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info)">
+													{{info.content}}
+												</view>
+												<view class="fs-24 fw-400 fc-9 mb-8">{{info.created_date}}</view>
+											</view>
+											<view class="display-flex" @click.stop="handUp(2,info)">
+												<uni-icons type="hand-up" size="20"
+													:color="info.is_like==1?'#FD5C02':'#999'"></uni-icons>
+												<view class="fs-24 fw-400 mt-5"
+													:class="info.is_like==1?'fc-FD5C02':'fc-9'">{{info.like}}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view v-if="item.replyList.length < item.count"
+									class="fs-24 fc-6 text-align-center mb-12" @click="openReply(2,item)">展开更多评论</view>
+							</view>
+
+						</view>
+					</view>
+					<view v-if="remarkData.list.length < remarkData.total" class="text-align-center fs-26"
+						@click="scrolltolowerList">加载更多评论</view>
+				</view>
+
+				<view class="input-box text-align-left fs-28 fc-9 box-border-box plr-24" @click.stop="openInput(0,'')">
+					友善评论，文明发言</view>
+			</view>
+
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	import EnBlank from "@/components/en-utils/en-blank/en-blank";
+	import {
+		alumnMyAlumni,
+		setAlumniLike,
+		getRemarkList,
+	} from "@/api/alumni.js"
+	import tools from "@/service/tools";
 	export default {
-		components: {},
+		components: {
+			EnBlank
+		},
 		data() {
 			return {
-				listData: [{
-					img: [
-						'https://img2.baidu.com/it/u=363454452,1934740400&fm=253&fmt=auto&app=138&f=JPEG?w=864&h=486'
-					]
-				}, {
-					img: ['https://img1.baidu.com/it/u=391647807,608347418&fm=253&fmt=auto&app=120&f=JPEG?w=889&h=500',
-						'https://img1.baidu.com/it/u=2042516722,265172545&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=500'
-					]
-				}, {
-					img: ['https://img0.baidu.com/it/u=3650197984,2591413134&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
-						'https://img0.baidu.com/it/u=1452587454,2859975382&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500',
-						'https://img1.baidu.com/it/u=2550250358,534330568&fm=253&fmt=auto&app=138&f=GIF?w=500&h=500',
-						'https://img2.baidu.com/it/u=1185521512,762382298&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500'
-					]
-				}]
+				listData: [],
+				isShowIpnut: false,
+				// 一级评论
+				remarkData: {
+					remark_id: '',
+					news_id: '',
+					total: 0,
+					list: [],
+					page: 1,
+				},
+				// 发起评论
+				msgData: {
+					news_id: '',
+					remark_id: '',
+					content: '',
+					reply_id: '',
+				},
+				// 回复评论
+				replyData: {
+					page: 1,
+				},
+				isAJAX: false,
+				total: 0,
 			};
 		},
 		onLoad(data) {},
-		mounted() {},
+		mounted() {
+			this.alumnMyAlumni()
+		},
 		methods: {
 			goToUrl() {
-				
+
+			},
+			// 点赞
+			handUp(type, item) {
+				if (this.isAJAX) {
+					return
+				}
+				this.isAJAX = true;
+				let is_like = item.is_like == 1 ? 0 : 1;
+				if (type == 1) {
+					// 点赞贴子
+					setAlumniLike({
+						news_id: item.news_id,
+						is_like: is_like
+					}).then((res) => {
+						this.handUpFun(res, item, is_like)
+					})
+				} else {
+					// 点赞评论
+					setRemarkLike({
+						news_id: item.news_id,
+						is_like: is_like,
+						remark_id: item.id
+					}).then((res) => {
+						this.handUpFun(res, item, is_like)
+					})
+				}
+			},
+			openInput(type,item){
+				if(type == 0){
+					this.msgData.remark_id = 0;
+				}else if(type == 1){
+					this.msgData.remark_id = item.id;
+					this.msgData.reply_id = item.m_id;
+				}else{
+					this.msgData.remark_id = item.remark_id;
+					this.msgData.reply_id = item.m_id;
+				}
+				this.isShowIpnut = true;
+			},
+			// 打开评论
+			openMsg(item) {
+				this.remarkData.news_id = item.news_id;
+				this.msgData.news_id = item.news_id;
+				this.remarkData.remark_id = 0;
+				this.getMsg();
+			},
+			// 获取回复列表
+			openReply(type,item){
+				// type 1获取其他 2加载更多
+				if(this.isAJAX){
+					return
+				}
+				this.isAJAX = true;
+				if(type == 1){
+					item.replyList = [];
+					this.replyData.page = 1;
+				}else{
+					this.replyData.page += 1;
+				}
+				getRemarkList({news_id:item.news_id,remark_id:item.id,page:this.replyData.page}).then((res)=>{
+					if(res.code === 1){
+						this.isAJAX = false;
+						item.replyList = [...item.replyList,...res.data.items];
+						item.isOpen = false;
+					}else{
+						this.isAJAX = false;
+						tools.error(res.msg)
+					}
+				})
+			},
+			// 获取评论
+			getMsg() {
+				if (this.isAJAX) {
+					return
+				}
+				this.isAJAX = true;
+				getRemarkList({
+					news_id: this.remarkData.news_id,
+					remark_id: this.remarkData.remark_id,
+					page: this.remarkData.page
+				}).then((res) => {
+					if (res.code === 1) {
+						this.isAJAX = false;
+						this.remarkData.list = [...this.remarkData.list, ...res.data.items];
+						this.remarkData.total = res.data.total;
+						this.remarkData.list.forEach((v) => {
+							v.replyList = [];
+							if (v.count > 0) {
+								v.isOpen = true;
+							}
+						})
+						this.$refs.popmsg.open();
+					} else {
+						this.isAJAX = false;
+						tools.error(res.msg)
+					}
+				})
 			},
 			scrolltolower() {
 				console.log('触底');
 			},
+			alumnMyAlumni() {
+				alumnMyAlumni({
+					page: this.page
+				}).then((res) => {
+					if (res.code == 1) {
+						if (res.data.items.length > 0) {
+							this.listData.push(res.data.items)
+						}
+					}
+				})
+			}
 		},
 	}
 </script>
@@ -174,7 +413,8 @@
 		height: 182rpx;
 		margin: 0 6rpx 6rpx 0;
 	}
-	.add-box{
+
+	.add-box {
 		position: fixed;
 		right: 98rpx;
 		top: 10vh;
@@ -182,10 +422,98 @@
 		height: 80vh;
 		z-index: 999;
 	}
-	.add-but{
+
+	.add-but {
 		width: 88rpx;
 		height: 88rpx;
 		line-height: 88rpx;
-		background: linear-gradient( 284deg, #0290FC 0%, #01D8FF 100%);
+		background: linear-gradient(284deg, #0290FC 0%, #01D8FF 100%);
+	}
+
+	.pop-box {
+
+		width: 100%;
+		height: 50vh;
+		background-color: #fff;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+		display: flex;
+		flex-direction: column;
+
+		.item-box {
+			width: 100%;
+			height: 92rpx;
+
+			border-radius: 200rpx;
+			line-height: 92rpx;
+			text-align: center;
+			margin-bottom: 24rpx;
+		}
+	}
+
+	.pop-msg {
+		height: 70vh;
+		position: relative;
+
+		.pop-input {
+			position: absolute;
+			width: 100%;
+			height: 70vh;
+			background-color: #fff;
+			bottom: 0;
+			left: 0;
+			border-top: 1rpx solid #ccc;
+			border-radius: 20rpx 20rpx 0 0;
+			display: flex;
+			flex-direction: column;
+
+			.save-box {
+				text-align: center;
+				line-height: 88rpx;
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				width: 100%;
+				height: 80rpx;
+				border-radius: 200rpx;
+				background: linear-gradient(105deg, #57CAFF 0%, #41ABF5 100%);
+			}
+		}
+
+		.head-pop {
+			padding-bottom: 34rpx !important;
+			border-bottom: 1rpx solid #F2F2F2;
+		}
+
+		.list-box {
+			.list-box-img {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				margin-right: 16rpx;
+			}
+
+			.only-box {
+				padding: 4rpx 16rpx;
+				background: rgba(65, 171, 245, 0.1);
+				border-radius: 8rpx 8rpx 8rpx 8rpx;
+			}
+
+			.msg-img {
+				width: 144rpx;
+				height: 144rpx;
+				border-radius: 12rpx;
+				margin-right: 5rpx;
+				margin-bottom: 5rpx;
+			}
+
+			.msg-img:nth-child(3n) {
+				margin-right: 0rpx;
+			}
+
+			.msg-img-1 {
+				width: 100rpx !important;
+				height: 100rpx !important;
+			}
+		}
 	}
 </style>

pages-my/publish-info.vue

@@ -3,7 +3,7 @@
 		<Nav title="" :leftShow='false' :customNav='true' bgckgroundBox='#fff'>
 			<template>
 				<view slot="custom" class="align-items-center">
-					<uni-icons class="mr-30" type="left" :color="leftColor" size="18"></uni-icons>
+					<uni-icons class="mr-30" type="left" :color="leftColor" size="18" @click='goBack'></uni-icons>
 					<view class="align-items-center">
 						<image class="nav-img mr-20" src="../static/img/my/user-img.png" mode=""></image>
 						<view class="">
@@ -29,6 +29,7 @@
 </template>
 
 <script>
+	import tools from "@/service/tools";
 	export default {
 		components: {},
 		data() {
@@ -37,6 +38,9 @@
 		onLoad(data) {},
 		mounted() {},
 		methods: {
+			goBack() {
+				tools.leftClick()
+			},
 			scrolltolower() {
 				console.log('触底');
 			},
@@ -53,7 +57,8 @@
 	.nav-name {
 		max-width: 348rpx;
 	}
-	.swiper-box{
+
+	.swiper-box {
 		width: 100%;
 		height: 920rpx;
 	}

pages-my/set-user-phone.vue

@@ -7,7 +7,7 @@
 					更换手机号
 				</view>
 				<view class="fs-28 fc-6 mb-32">
-					一个手机号只能绑定一个账号，绑定的手机账号禁止修改。
+					一个手机号只能绑定一个账号
 				</view>
 				<view class="phone-box mb-22">
 					<image class="icons" src="@/static/img/my/yzm-icons.png" mode=""></image>

pages-my/user-info.vue

@@ -2,8 +2,8 @@
 	<view class="flex-common-css bgc-f">
 		<Nav title="个人资料" titleColor="#333" bgckgroundBox='#fff'></Nav>
 		<scroll-view :scroll-y="true" class="scroll-view-css">
-			<view class="user-img-box">
-				<image class="user-img" :src="userInfoData.head_img" mode=""></image>
+			<view class="user-img-box b-rad-50">
+				<image class="user-img b-rad-50" :src="userInfoData.head_img" mode=""></image>
 				<image @click="goToUrl(0)" class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
 			</view>
 			<view class="item-info-box box-border-box">
@@ -35,7 +35,7 @@
 					</view>
 					<view class="item-right align-items-center" @click="goToUrl(3)">
 						<view class="fc-9198A2 fs-28 mr-6">
-							{{userInfoData.phone}}
+							{{userInfoData.phone?'去更改':'去绑定'}}
 						</view>
 						<uni-icons color="#9198A2" type="right" size="20"></uni-icons>
 					</view>
@@ -46,17 +46,23 @@
 </template>
 
 <script>
-	import {userInfo} from '@/api/member.js'
+	import {
+		userInfo,
+		userUpdate
+	} from '@/api/member.js'
 	import tools from '@/service/tools';
+	import {
+		upLoadingFileOss
+	} from "@/service/upLoadingFile.js"
 	export default {
 		data() {
 			return {
-				userInfoData:{
-					nickname:'',
-					head_img:'',
-					phone:'',
-					sex:'',
-					msg_count:'',
+				userInfoData: {
+					nickname: '',
+					head_img: '',
+					phone: '',
+					sex: '',
+					msg_count: '',
 				},
 			};
 		},
@@ -64,18 +70,19 @@
 			this.getUserInfo();
 		},
 		methods: {
-			getUserInfo(){
-				userInfo().then((res)=>{
-					if(res.code === 1){
-						this.userInfoData = res.data;
-					}
-				})
-			},
-			
 			goToUrl(type) {
-				if(type === 0){
-					
-				}else if (type === 1) {
+				if (type === 0) {
+					uni.chooseImage({
+						count: 1,
+						sizeType: ["compressed", "camera"],
+						sourceType: ["album", "camera"],
+						success: (res) => {
+							res.tempFiles.forEach((file) => {
+								this.uploadingFile(file);
+							})
+						}
+					})
+				} else if (type === 1) {
 					// 昵称
 					uni.navigateTo({
 						url: '/pages-my/set-user-name'
@@ -92,6 +99,34 @@
 					})
 				}
 			},
+			uploadingFile(file) {
+				upLoadingFileOss(file.path).then((res) => {
+					if (res) {
+						this.userUpdate(res)
+					} else {
+						tools.error('图片上传失败')
+					}
+				})
+			},
+			userUpdate(img) {
+				userUpdate({
+					head_img: img
+				}).then((res) => {
+					if (res.code == 1) {
+						tools.success(res.msg)
+						this.getUserInfo()
+					} else {
+						tools.error(res.msg)
+					}
+				})
+			},
+			getUserInfo() {
+				userInfo().then((res) => {
+					if (res.code === 1) {
+						this.userInfoData = res.data;
+					}
+				})
+			}
 		},
 	}
 </script>

pages.json

@@ -368,7 +368,7 @@
 		"current": 0,
 		"list": [{
 			"name": "列表调试",
-			"path": "pages-my/publish-info",
+			"path": "pages-my/my-appraise",
 			"query": ""
 		}]
 	}

pages/me/index.vue

@@ -4,8 +4,8 @@
 		<image class="bg-box" src="@/static/img/my/bg.png" mode=""></image>
 		<view class="user-box align-items-center" @click="goToUrl(0)">
 			<view class="user-img-box mr-24">
-				<image v-if="userInfoData.head_img" class="user-img" :src="userInfoData.head_img" mode=""></image>
-				<image v-else class="user-img" src="@/static/img/my/user-img.png" mode=""></image>
+				<image v-if="userInfoData.head_img" class="user-img b-rad-50" :src="userInfoData.head_img" mode=""></image>
+				<image v-else class="user-img b-rad-50" src="@/static/img/my/user-img.png" mode=""></image>
 				<image  class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
 			</view>
 			<view class="user-name text-overflow-ellipsis-one fs-34">
@@ -148,7 +148,6 @@
 
 <script>
 	import {userInfo} from '@/api/member.js'
-	
 	export default {
 		components: {},
 		data() {