Merge branch 'feature/comment-0624-ch' into msb_test

components/BsCommentInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-24 11:43:04
  * @LastEditors: ch
- * @LastEditTime: 2022-06-30 14:27:38
+ * @LastEditTime: 2022-06-30 19:46:42
  * @Description: file content
 -->
 <template>
@@ -22,7 +22,7 @@
 			<template v-else>
 				<div class="top">
 					<el-rate :value="commentDetail.commentScore" disabled/>
-					<span class="time">{{commentDetail.createTime}}</span>
+					<span class="time">{{FormatDate(commentDetail.createTime, 'yyyy-mm-dd hh:ii')}}</span>
 				</div>
 				<p class="sku">已购买：{{commentDetail.skuName}}</p>
 				<div class="ctx">{{commentDetail.commentContent}}</div>
@@ -64,7 +64,7 @@
 							<li class="answer--item" v-for="(item, idx) in answerCommentList" :key="idx">
 								<div class="answer--name">
 									<b>{{item.userName}} {{item.parentId !== commentDetail.id ? ` 回复 ${item.parentUserName}` : ''}}：</b>
-									<span>{{item.createTime}}</span>
+									<span>{{FormatDate(item.createTime, 'yyyy-mm-dd hh:ii')}}</span>
 								</div>
 								<p class="answer--ctx">{{item.commentContent}}</p>
 								<span class="answer--answer" @click="handleAnswer(item)">回复</span>
@@ -87,7 +87,7 @@
 <script>
 import BsCommentFollowInfo from './BsCommentFollowInfo.vue';
 import {ApiPostComment, ApiPutCommentUseful} from '@/plugins/api/comment';
-import {Debounce } from '@/plugins/utils';
+import {Debounce, FormatDate } from '@/plugins/utils';
 import UiImgs from './UiImgs.vue';
 import UiButton from './UiButton.vue';
 import BsCommentSubmit from './BsCommentSubmit.vue';
@@ -159,6 +159,7 @@ export default {
 		this.answerCommentList = this.commentDetail.answerCommentList || [];
 	},
 	methods : {
+		FormatDate,
 		/**
 		 * 评价成功后，抛出事件，方便父组件做数据处理
 		 */
@@ -289,6 +290,10 @@ export default {
 	display: flex;
 	justify-content: space-between;
 	margin-bottom: 10px;
+	/deep/.el-rate__icon{
+		margin-right: 0;
+		font-size: 24px;
+	}
 }
 .time, .sku{
 	color: #999;
@@ -388,6 +393,12 @@ export default {
 	}
 	&--btn{
 		height: 40px;
+		font-size: 14px;
+		
+	}
+	/deep/.ui-button__disabled{
+		background: #eee;
+		color: #999;
 	}
 }
 </style>

components/UiImgs.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-24 19:07:45
  * @LastEditors: ch
- * @LastEditTime: 2022-06-30 11:40:54
+ * @LastEditTime: 2022-06-30 19:40:36
  * @Description: file content
 -->
 <template>
@@ -82,6 +82,7 @@ export default {
 		width: 300px;
 		margin-top: 20px;
 		position: relative;
+		border: 1px solid #eee;
 		img{
 			width: 300px;
 			height: 300px;
@@ -116,11 +117,11 @@ export default {
 				top: 16px;
 			}
 			&.prev{
-				left: 0;
+				left: 10px;
 				
 			}
 			&.next{
-				right: 0;
+				right: 10px;
 				&::after{
 					left: 20px;
 					transform: rotate(45deg);

pages/account/index/order/detail/module/StatusInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-06-28 21:58:08
+ * @LastEditTime: 2022-06-30 20:01:46
  * @Description: file content
 -->
 <template>
@@ -53,6 +53,7 @@ export default {
 				'5' : {name:'已收货'},
 				// 已完成
 				'6' : {name:'交易成功'},
+				'7' : {name:'交易成功'},
 			},
 			ctxCon : {},
 			startSecondNum : 0,

pages/goods/detail/module/Comment.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-24 14:39:38
  * @LastEditors: ch
- * @LastEditTime: 2022-06-29 14:20:54
+ * @LastEditTime: 2022-06-30 20:10:31
  * @Description: file content
 -->
 <template>
@@ -26,7 +26,7 @@
 					<div class="ctx--top-rate" v-if="productRate">
 						<b>商品满意度</b>
 						<p>{{productRate}}</p>
-						<el-rate :value="productRate" disabled></el-rate>
+						<el-rate :value="productRate" disabled size="16px"></el-rate>
 					</div>
 					<div class="ctx--top-tabs" v-if="tabs.length > 1">
 						<span v-for="i in tabs" :key="i.labelType" @click="handleTabChanage(i)"
@@ -105,7 +105,7 @@ export default {
 				productId : this.productId,
 				commentLabel : this.tabActive == -1 ? null : this.tabActive,
 				sortType : this.sortActive.val,
-				isContent : this.isContent
+				isContent : this.isContent || null
 			});
 			this.loading = false
 			if(error){
@@ -183,6 +183,10 @@ export default {
 	justify-content: space-between;
 	&--sort{
 		margin-right: 30px;
+		cursor: pointer;
+		&:hover{
+			color: #FF512B;
+		}
 	}
 }
 .ctx{
@@ -200,12 +204,15 @@ export default {
 			position: relative;
 			b{
 				font-weight: normal;
+				display: block;
+   				height: 14px;
 			}
 			p{
 				font-size: 40px;
 				height: 40px;
 				line-height: 40px;
 				font-weight: bold;
+				margin-top: 6px;
 			}
 			&::after{
 				content: '';
@@ -217,10 +224,16 @@ export default {
 				right: 0;
 				top: 26px;
 			}
+			/deep/.el-rate__icon{
+				margin-right: 0;
+				font-size: 24px;
+			}
 		}
 		&-tabs{
 			margin: 34px 0;
 			padding-left: 40px;
+			display: flex;
+			align-items: center;
 			span{
 				display: inline-block;
 				height: 24px;