From 8891cc6734704c3d9a8143c7681051e615fd0a8a Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 23 Jun 2022 17:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env.config.js                                 |   6 +-
 src/common/api/comment.js                     |  50 +++++
 src/common/api/order.js                       |   9 +-
 src/common/dicts/comment.js                   |  32 +++
 src/common/dicts/order.js                     |  32 ++-
 src/common/store/index.js                     |  23 +-
 src/common/utils/index.js                     |   6 +-
 src/common/utils/uploadFileOss.js             |  46 ++++
 src/common/utils/utils.js                     |  25 ++-
 src/components/BsChoiceGoods.vue              |   4 +-
 src/components/BsCommentFollowInfo.vue        |  69 ++++++
 src/components/BsCommentGoodsInfo.vue         |  64 ++++++
 src/components/BsCommentInfo.vue              |  78 +++++++
 src/components/BsCommentMerchant.vue          |  47 ++++
 src/components/BsCommentSubmit.vue            | 130 +++++++++++
 src/components/BsCommentThumbup.vue           |  52 +++++
 src/components/BsCommentUserInfo.vue          |  47 ++++
 src/components/UiWhiteBox.vue                 |   6 +-
 src/main.js                                   |  15 +-
 src/manifest.json                             |   5 +-
 src/pages.json                                |  53 +++++
 src/pages/goods/comment/detail.vue            | 209 ++++++++++++++++++
 src/pages/goods/comment/list.vue              | 192 ++++++++++++++++
 src/pages/goods/comment/otherList.vue         | 105 +++++++++
 src/pages/goods/comment/preview.vue           |  76 +++++++
 src/pages/goods/detail/index.vue              |  70 ++++--
 src/pages/goods/detail/modules/Comment.vue    |  87 ++++++++
 src/pages/index/index.vue                     |   4 +-
 src/pages/index/modules/Banner.vue            |   4 +-
 src/pages/order/comment/index/index.vue       | 122 ++++++++++
 .../comment/index/modules/SubmitComment.vue   | 106 +++++++++
 .../index/modules/SubmitFollowComment.vue     |  70 ++++++
 src/pages/order/comment/submitFollow.vue      | 156 +++++++++++++
 src/pages/order/comment/success.vue           | 119 ++++++++++
 src/pages/order/detail/index.vue              |  10 +-
 src/pages/order/list.vue                      |  33 ++-
 src/pages/order/logisitcsInfo.vue             |   8 +-
 src/pages/order/payResult.vue                 |   4 +-
 src/static/comment/sort.png                   | Bin 0 -> 341 bytes
 src/static/comment/sort_active.png            | Bin 0 -> 341 bytes
 40 files changed, 2085 insertions(+), 89 deletions(-)
 create mode 100644 src/common/api/comment.js
 create mode 100644 src/common/dicts/comment.js
 create mode 100644 src/common/utils/uploadFileOss.js
 create mode 100644 src/components/BsCommentFollowInfo.vue
 create mode 100644 src/components/BsCommentGoodsInfo.vue
 create mode 100644 src/components/BsCommentInfo.vue
 create mode 100644 src/components/BsCommentMerchant.vue
 create mode 100644 src/components/BsCommentSubmit.vue
 create mode 100644 src/components/BsCommentThumbup.vue
 create mode 100644 src/components/BsCommentUserInfo.vue
 create mode 100644 src/pages/goods/comment/detail.vue
 create mode 100644 src/pages/goods/comment/list.vue
 create mode 100644 src/pages/goods/comment/otherList.vue
 create mode 100644 src/pages/goods/comment/preview.vue
 create mode 100644 src/pages/goods/detail/modules/Comment.vue
 create mode 100644 src/pages/order/comment/index/index.vue
 create mode 100644 src/pages/order/comment/index/modules/SubmitComment.vue
 create mode 100644 src/pages/order/comment/index/modules/SubmitFollowComment.vue
 create mode 100644 src/pages/order/comment/submitFollow.vue
 create mode 100644 src/pages/order/comment/success.vue
 create mode 100644 src/static/comment/sort.png
 create mode 100644 src/static/comment/sort_active.png

diff --git a/env.config.js b/env.config.js
index 3e547a6..77444f1 100644
--- a/env.config.js
+++ b/env.config.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-05 14:40:00
  * @LastEditors: ch
- * @LastEditTime: 2022-06-09 11:25:44
+ * @LastEditTime: 2022-06-22 17:26:10
  * @Description: 根据git分支生成对应环境的环境变量
  * 开发时如果环境变量换了，可以不用重启服务，直接运行node env.config.js即可
  */
@@ -11,7 +11,9 @@ const path = require('path');
 
 const envConfig = {
 	dev : {
-		baseUrl: 'https://k8s-horse-gateway.mashibing.cn',
+		// baseUrl: 'https://you-gateway.mashibing.com',
+		// baseUrl: 'https://k8s-horse-gateway.mashibing.cn',
+		baseUrl: '',
 		staticUrl : 'https://k8s-shop-app.mashibing.cn',
 		// imUrl : 'ws://192.168.10.94:8090'
 		imUrl : 'wss://k8s-horse-gateway.mashibing.cn'
diff --git a/src/common/api/comment.js b/src/common/api/comment.js
new file mode 100644
index 0000000..5cc5c6e
--- /dev/null
+++ b/src/common/api/comment.js
@@ -0,0 +1,50 @@
+/*
+ * @Author: ch
+ * @Date: 2022-06-20 11:38:48
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-22 20:53:16
+ * @Description: file content
+ */
+
+import {ToAsyncAwait, MsbRequest, MsbRequestTk} from '@/common/utils';
+
+const BASE_URL = '/mall/comment';
+
+/**
+ * 根据商品获取评论列表
+ * @param {*} param0 
+ */
+export const ApiGetCommentList = (params) => 
+	ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/comment`, params));
+/**
+ * 根据商品获取评论总数
+ * @param {*} param0 
+ */
+export const ApiGetCommentCount = ({productId}) => 
+	ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/comment/getAllCommentCountByProductId/${productId}`));
+/**
+ * 根据商品获取标签评论总数
+ * @param {*} param0 
+ */
+export const ApiGetCommentTabCount = ({productId}) => 
+	ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/comment/listCommentLabel/${productId}`));
+/**
+ * 获取订单评论详情
+ * @param {*} param0 
+ */
+export const ApiGetOrderCommentDetail = ({orderId}) => 
+	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/comment/listOrderCommentByOrderId/${orderId}`));
+/**
+ * 获取评论详情
+ * @param {*} param0 
+ */
+export const ApiGetCommentDetail = ({commentId}) => 
+	ToAsyncAwait(MsbRequest.get(`${BASE_URL}/app/comment/getCommentDetail/${commentId}`));
+/**
+ * 新增评论
+ * @param {*} param0 
+ */
+export const ApiPostComment = (data) => 
+	ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/app/comment`, data));
+
+
diff --git a/src/common/api/order.js b/src/common/api/order.js
index e534f7f..66a2881 100644
--- a/src/common/api/order.js
+++ b/src/common/api/order.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-29 17:38:17
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 16:14:53
+ * @LastEditTime: 2022-06-23 16:21:32
  * @Description: file content
  */
 import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@@ -84,8 +84,11 @@ export const ApiPutCancelOrder = (data) =>
 export const ApiGetOrderStatistics = () =>
 	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/statistics`));
 
-
-
+/**
+ * 获取待评价订单详请列表
+ */
+export const ApiGetCommentOrderDetailList = (params) => 
+	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/listOrderProductWaitComment`,params))
 
 
 /**
diff --git a/src/common/dicts/comment.js b/src/common/dicts/comment.js
new file mode 100644
index 0000000..2d36112
--- /dev/null
+++ b/src/common/dicts/comment.js
@@ -0,0 +1,32 @@
+/*
+ * @Author: ch
+ * @Date: 2022-06-20 11:10:23
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-22 18:05:27
+ * @Description: file content
+ */
+export default {
+	TYPE : {
+		// 评价
+		COMMENT: 1,
+		// 追评
+		FOLLOW_COMMENT: 2,
+		// 回复
+		ANSWER: 3,
+	},
+	// 是否显示
+	DISPLAY: {
+		SHOW: 1,
+		HIDE  : 0
+	},
+	// 用户类型
+	USER_TYPE: {
+		STORE : 1,
+		USER : 2
+	},
+	// 是否默认评价
+	IS_DEFAULT_COMMENT: {
+		YES: 1,
+		NOT : 0
+	}
+}
\ No newline at end of file
diff --git a/src/common/dicts/order.js b/src/common/dicts/order.js
index f9adb0b..a7ed1af 100644
--- a/src/common/dicts/order.js
+++ b/src/common/dicts/order.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-26 11:49:16
  * @LastEditors: ch
- * @LastEditTime: 2022-05-26 17:00:06
+ * @LastEditTime: 2022-06-22 11:23:02
  * @Description: file content
  */
 
@@ -11,13 +11,25 @@ export const ORDER_STATUS = {
 	// 待支付
 	AWAIT_PAY: 1
 }
-export const ORDER_TYPE = {
-	//(1, "普通订单"),
-	NORMAL: 1,
-	//(2, "免费订单"),
-	FREE: 2, 
-	//(3, "秒杀订单"),
-	SECKILL: 3, 
-	//(4, "虚拟商品订单"),
-    VIRTUAL : 4 
+export default {
+	TYPE : {
+		//(1, "普通订单"),
+		NORMAL: 1,
+		//(2, "免费订单"),
+		FREE: 2, 
+		//(3, "秒杀订单"),
+		SECKILL: 3, 
+		//(4, "虚拟商品订单"),
+		VIRTUAL : 4 
+	},
+	// 订单状态 1：待支付，2：已关闭，3：已支付，4：已发货，5：已收货，6：已完成，7：已追评
+	STATUS: {
+		AWAIT_PAY: 1,
+		CLOSE: 2,
+		FINISH_PAY: 3,
+		FINISH_SEND_GOODS: 4,
+		FINISH_TAKE_GOODS: 5,
+		FINISH: 6,
+		FINISH_FOLLOW_COMMENT : 7
+	}
 }
\ No newline at end of file
diff --git a/src/common/store/index.js b/src/common/store/index.js
index 004d46b..493a738 100644
--- a/src/common/store/index.js
+++ b/src/common/store/index.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 18:28:52
  * @LastEditors: ch
- * @LastEditTime: 2022-06-14 17:33:42
+ * @LastEditTime: 2022-06-22 15:31:09
  * @Description: file content
  */
 import Vue from 'vue'
@@ -19,15 +19,18 @@ const
 	// oppenId
 	OPPED_ID = 'oi',
 	// 每个浏览器创建一个UUID作为同一个用户的标识
-	UUID = 'uid';;
+	UUID = 'uid',
+	// 评价图片预览数据
+	COMMENT_PREVIEW = 'comment_preview';
 
 export default new Vuex.Store({
-	state : {
-		token : uni.getStorageSync(TOKEN) || '',
-		userInfo : JSON.parse(uni.getStorageSync(USER_INFO) || '{}'),
-		address : JSON.parse(uni.getStorageSync(ADDRESS) || '[]'),
-		openId : uni.getStorageSync(OPPED_ID) || '',
-		uuid : uni.getStorageSync(UUID) || '',
+	state: {
+		token: uni.getStorageSync(TOKEN) || '',
+		userInfo: JSON.parse(uni.getStorageSync(USER_INFO) || '{}'),
+		address: JSON.parse(uni.getStorageSync(ADDRESS) || '[]'),
+		openId: uni.getStorageSync(OPPED_ID) || '',
+		uuid: uni.getStorageSync(UUID) || '',
+		comment_preview: JSON.parse(uni.getStorageSync(COMMENT_PREVIEW) || '{}'),
 		imData : [],
 		imMsgCount : 0
 	},
@@ -52,6 +55,10 @@ export default new Vuex.Store({
 			state.openId = data;
 			uni.setStorageSync(OPPED_ID, data);
 		},
+		SET_COMMENT_PREVIEW(state, data) {
+			state.comment_preview = data;
+			uni.setStorageSync(COMMENT_PREVIEW, JSON.stringify(data));
+		},
 		SET_IM_DATA (state, data){
 			state.imData = data ;
 		},
diff --git a/src/common/utils/index.js b/src/common/utils/index.js
index 75ac9ef..c5520fc 100644
--- a/src/common/utils/index.js
+++ b/src/common/utils/index.js
@@ -2,17 +2,19 @@
  * @Author: ch
  * @Date: 2022-03-22 16:52:28
  * @LastEditors: ch
- * @LastEditTime: 2022-05-20 11:42:33
+ * @LastEditTime: 2022-06-21 15:12:11
  * @Description: 所有工具类统一在这输出
  */
 import * as util from './utils';
 import * as requset from './requset';
 import * as im from './im';
 import * as wxpay from './wxpay';
+import * as uploadFileOss from './uploadFileOss';
 
 export * from './utils';
 export * from './requset';
 export * from './im';
 export * from './wxpay';
+export * from './uploadFileOss';
 
-export default { ...util, ...requset, ...im, ...wxpay}
\ No newline at end of file
+export default { ...util, ...requset, ...im, ...wxpay, ...uploadFileOss}
\ No newline at end of file
diff --git a/src/common/utils/uploadFileOss.js b/src/common/utils/uploadFileOss.js
new file mode 100644
index 0000000..ed0680c
--- /dev/null
+++ b/src/common/utils/uploadFileOss.js
@@ -0,0 +1,46 @@
+/*
+ * @Author: ch
+ * @Date: 2022-06-21 15:03:11
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-22 14:49:20
+ * @Description: file content
+ */
+import { ApiPostGetOssConfig } from '@/common/api/oss';
+import {ToAsyncAwait} from '@/common/utils'
+/**
+ * 
+ * @param {*} file 文件
+ * @param {*} param1 获取OSS鉴权信息参数，参考ApiPostGetOssConfig接口
+ * @returns {Promise}
+ */
+export const uploadFileOss = (file, {configId, serviceName}) =>{
+	return ToAsyncAwait(new Promise(async (resolve, reject) => {
+		const urlArr = file.url.split('/');
+		const fileName = file.name || urlArr[urlArr.length - 1];
+		const { error, result:oss } = await ApiPostGetOssConfig({ configId : `${configId}/`, serviceName });
+		if (error) {
+			reject(error);
+			return false
+		}
+		uni.uploadFile({
+			name : 'file',
+			filePath : file.url,
+			url : oss.host,
+			formData : {
+				name : fileName,
+				key : `${oss.dir}${'${filename}'}`,
+				policy : oss.policy,
+				OSSAccessKeyId : oss.accessId,
+				success_action_status : 200,
+				signature : oss.signature
+			},
+			success : async (res)=>{
+				resolve(`${oss.host}/${oss.dir}${fileName}`);
+			},
+			fail(e) {
+				reject(e);
+			}
+		})
+	}
+	))
+}
\ No newline at end of file
diff --git a/src/common/utils/utils.js b/src/common/utils/utils.js
index 3b1ea3b..0fb9969 100644
--- a/src/common/utils/utils.js
+++ b/src/common/utils/utils.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 19:15:10
  * @LastEditors: ch
- * @LastEditTime: 2022-06-02 14:55:45
+ * @LastEditTime: 2022-06-22 10:39:15
  * @Description: 一些无法归类的公共方法容器
  */
 
@@ -43,11 +43,6 @@ const Debounce = (fn, delay) => {
  * @param {*} link 
  */
 const AdJump = (item) => {
-	// if (!/^(http|https):\/\/./.test(link)) {
-	// 	uni.$u.toast('非法链接,暂不跳转！');
-	// 	return false;
-	// }
-	console.log(item);
 	switch (item.jumpType) {
 		case AD_JUMP_TYPE.GOODS:
 			uni.navigateTo({
@@ -71,6 +66,21 @@ const AdJump = (item) => {
 			break
 	}
 }
+/**
+ * api接口错误处理
+ * @param {*} error 错误体
+ * @param {*} name 接口名 非必传，如操作时错误提示不需要提示接口名时可不传
+ * @return Boolean true 存在错误并处理 false无错误
+ */
+const HandleApiError = (error, name) => {
+	let result = false
+	if (error) {
+		const tip = name ? `${name}错误：` : ``; 
+		uni.$u.toast(`${tip}${error.message}`);
+		result = true;
+	}
+	return result;
+}
 // 工具类的文件需要把文件提供的工具类统一放最下方做一个统一输出
 export {
 	// async await 标识结果处理
@@ -85,5 +95,6 @@ export {
 	// 防抖函数
 	Debounce,
 	// 广告跳转
-	AdJump
+	AdJump,
+	HandleApiError
 }
\ No newline at end of file
diff --git a/src/components/BsChoiceGoods.vue b/src/components/BsChoiceGoods.vue
index 4a008db..e72743d 100644
--- a/src/components/BsChoiceGoods.vue
+++ b/src/components/BsChoiceGoods.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 16:45:27
  * @LastEditors: ch
- * @LastEditTime: 2022-05-06 14:26:57
+ * @LastEditTime: 2022-06-22 19:34:13
  * @Description: file content
 -->
 <template>
@@ -38,10 +38,10 @@ export default {
 				...this.params
 			});
 			const res = result.records.map(item => {
-				// item.labelList[{text:'x',code : 'recommended'},{text:'x',code : 'second_kill'}]
 				// 标签数据重新组装
 				item.seckill = false;
 				item.tagList = [];
+				item.labelList = item.labelList || [];
 				item.labelList.forEach(i => {
 					if(i.code === 'second_kill'){
 						item.seckill = true;
diff --git a/src/components/BsCommentFollowInfo.vue b/src/components/BsCommentFollowInfo.vue
new file mode 100644
index 0000000..9787686
--- /dev/null
+++ b/src/components/BsCommentFollowInfo.vue
@@ -0,0 +1,69 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-23 10:40:04
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 10:48:48
+ * @Description: file content
+-->
+<template>
+	<view class="follow">
+		<view class="follow--title">{{day}}追评:</view>
+		<view class="follow--ctx">{{followComment.commentContent}}</view>
+		<view class="follow--img" v-if="imgs.length">
+			<image class="follow--img-item" v-for="(item, idx) in imgs" :src="item" :key="idx" @click="preview(idx)" mode="aspectFit"/>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	props : {
+		followComment : {
+			type : Object,
+			default : () => ({})
+		},
+		commentTime : {
+			type : String,
+			default : ''
+		}
+	},
+	computed:{
+		day(){
+			const followTime = (new Date(this.followComment.createTime)).getTime();
+			const commentTime = (new Date(this.commentTime)).getTime();
+			const day = Math.floor((followTime - commentTime) / (24 * 60 * 60 * 1000));
+			return day > 0 ? `${day}天后` : `当天`;
+		},
+
+		imgs (){
+			let urls = this.followComment.pictureUrl || '';
+			return urls ? urls.split(',') : [];
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.follow{
+	margin-top: 40rpx;
+	&--title{
+		color: $color-yellow3;
+		font-size: 28rpx;
+	}
+	&--ctx{
+		margin-top: 20rpx;
+		font-size: 30rpx;
+		line-height: 46rpx;
+	}
+	&--img{
+
+		margin-top: 30rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+		&-item{
+			width: 210rpx;
+			height: 210rpx;
+			margin:20rpx 0;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/components/BsCommentGoodsInfo.vue b/src/components/BsCommentGoodsInfo.vue
new file mode 100644
index 0000000..7b1bcf4
--- /dev/null
+++ b/src/components/BsCommentGoodsInfo.vue
@@ -0,0 +1,64 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-20 14:30:45
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 16:26:33
+ * @Description: file content
+-->
+<template>
+	<view class="goods">
+		<image class="goods--img" :src="goods.productPicture" mode="aspectFit" ></image>
+		<view class="goods--ctx">
+			<view class="goods--title">{{ goods.productName }}</view>
+			<view class="goods--footer">
+				<view class="goods--sku">{{ goods.skuName }}</view>
+				<view><slot name="btns"></slot></view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	props : {
+		goods : {
+			type : Object,
+			default : ()=>({})
+		}
+	}
+	
+}
+</script>
+<style lang="scss" scoped>
+
+.goods {
+	display: flex;
+	&--img {
+		width: 130rpx;
+		height: 130rpx;
+		margin-right: 30rpx;
+	}
+	&--ctx{
+		flex: 1;
+		overflow: hidden;
+		padding: 20rpx 0;
+	}
+	&--title{
+		font-size: 28rpx;
+		overflow:hidden; 
+		text-overflow:ellipsis;
+		white-space: nowrap;
+
+	}
+	&--footer{
+		display: flex;
+		justify-content: space-between;
+	}
+	&--sku{
+		font-size: 24rpx;
+		color: #999;
+		margin-top: 20rpx;
+		
+
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/components/BsCommentInfo.vue b/src/components/BsCommentInfo.vue
new file mode 100644
index 0000000..0810042
--- /dev/null
+++ b/src/components/BsCommentInfo.vue
@@ -0,0 +1,78 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 15:50:01
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-22 17:49:10
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="top">
+			<u-rate count="5" size="30rpx" :value="commentDetail.commentScore" activeColor="#FFA35B" readonly inactiveColor="#DDD"></u-rate>
+			<text class="top--time">{{ commentDetail.createTime }}</text>
+		</view>
+		<view class="ctx">{{ commentDetail.commentContent }}</view>
+		<view class="img" v-if="imgs.length">
+			<image class="img--item" v-for="(item, idx) in imgs" :src="item" :key="idx" @click="preview(idx)" mode="aspectFit"/>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	props : {
+		commentDetail : {
+			type : Object,
+			default : () => ({})
+		}
+	},
+	data:{
+		curPreview : -1	
+	},
+	computed : {
+		imgs (){
+			let urls = this.commentDetail.pictureUrl || '';
+			return urls ? urls.split(',') : [];
+		}
+	},
+	methods:{
+		preview(idx){
+			this.$store.commit('SET_COMMENT_PREVIEW', this.commentDetail);
+			this.$Router.push({
+				path : '/goodsCommentPreview',
+				query : {
+					idx
+				}
+			});
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+
+.top{
+	display: flex;
+	justify-content: space-between;
+	margin: 20rpx 0;
+	&--time{
+		font-size: 24rpx;
+		color: #999;
+	}
+}
+.ctx{
+	font-size: 30rpx;
+	line-height: 46rpx;
+	word-break: break-all;
+}
+.img{
+	margin-top: 30rpx;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	&--item{
+		width: 210rpx;
+		height: 210rpx;
+		margin:20rpx 0;
+	}
+	
+}
+</style>
\ No newline at end of file
diff --git a/src/components/BsCommentMerchant.vue b/src/components/BsCommentMerchant.vue
new file mode 100644
index 0000000..0b23d32
--- /dev/null
+++ b/src/components/BsCommentMerchant.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 15:59:23
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-21 16:05:16
+ * @Description: file content
+-->
+<template>
+	<view class="merchant">
+		<view class="merchant--title">
+			<text class="merchant--name">{{merchantComment.userName}}</text>
+			<text class="merchant--time">{{merchantComment.createTime}}</text>
+		</view>
+		<view class="merchant--ctx">{{merchantComment.commentContent}}</view>
+	</view>
+</template>
+<script>
+export default {
+	props : {
+		merchantComment : {
+			type : Object,
+			default : () => ({})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+
+.merchant{
+	margin-top: 40rpx;
+	padding: 30rpx;
+	background: #F5F5F5;
+	&--title{
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 24rpx;
+	}
+	&--time{
+		color: #999;
+		font-size: 24rpx;
+	}
+	&--ctx,&--name{
+		font-size: 26rpx;
+		color: #666;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/components/BsCommentSubmit.vue b/src/components/BsCommentSubmit.vue
new file mode 100644
index 0000000..3491be6
--- /dev/null
+++ b/src/components/BsCommentSubmit.vue
@@ -0,0 +1,130 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-20 16:36:14
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 16:56:09
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="rate" v-if="type === COMMENT.TYPE.COMMENT">
+			<text class="rate--title">满意度评分</text>
+			<u-rate :count="5" v-model="rate" size="47rpx" activeColor="#FFA35B" inactiveColor="#DDD"></u-rate>
+			<text class="rate--desc">满意</text>
+		</view>
+		<textarea class="textarea" placeholder="从多个维度评价，可以帮助更多想买的人哦~" 
+			:maxlength="500" v-model="commentContent"></textarea>
+		<u-upload  class="upload" 
+			@afterRead="handleUpdateImg" @delete="handleDelImg" 
+			:fileList="fileList" :maxCount="6" :previewFullImage="true">
+		</u-upload>
+		<view class="footer">
+			<UiButton type="solid" :disable="isVerify" @click="handleSubmit">发表评价</UiButton>
+		</view>
+	</view>
+</template>
+<script>
+import UiButton from '@/components/UiButton.vue';
+import {ApiPostComment} from '@/common/api/comment';
+import COMMENT from '@/common/dicts/comment';
+import {uploadFileOss} from '@/common/utils';
+export default {
+	components: { UiButton },
+	props:{
+		type : {
+			type : String | Number,
+			default : COMMENT.TYPE.COMMENT
+		},
+		commentDetail : {
+			type : Object,
+			default : ()=> ({})
+		}
+	},
+	data(){
+		return {
+			COMMENT,
+			rate : 0,
+			commentContent : '',
+			fileList : []
+		}
+	},
+	computed:{
+		isVerify(){
+			if(this.type === COMMENT.TYPE.COMMENT){
+				return !this.rate;
+			}else{
+				return !this.commentContent;
+			}
+		},
+		isEdit (){
+			return (this.rate || this.commentContent || this.fileList.length > 0) ? true : false
+		}
+	},
+	watch:{
+		isEdit(){
+			this.$emit('editChang',this.isEdit)
+		}
+	},
+	methods:{
+		async handleSubmit(){
+			let data = {
+				commentContent : this.commentContent,
+				commentType : this.type,
+				orderProductId : this.commentDetail.orderProductId,
+				pictureUrl : this.fileList.map(i => i.url).join(',')
+			}
+			if(this.type === COMMENT.TYPE.COMMENT){
+				data.productId = this.commentDetail.productId;
+				data.commentScore = this.rate;
+			}else if(this.type === COMMENT.TYPE.FOLLOW_COMMENT){
+				data.originId = data.parentId = this.commentDetail.id;
+			}
+			const {error, result} = await ApiPostComment(data);
+			if(error){
+				uni.$u.toast(error.message);
+				return false;
+			}
+			this.$emit('submit',result);
+		},
+		async handleUpdateImg(val){
+			const {error, result} = await uploadFileOss(val.file, {
+				configId : 'account-comment',
+				serviceName : 'comment'
+			})
+			if(error){
+				uni.$u.toast(error);
+			}
+			this.fileList.push({url : result});
+		},
+		handleDelImg(target){
+			this.fileList.splice(target.index, 1)
+		}
+	}
+	
+}
+</script>
+<style lang="scss" scoped>
+.rate{
+	display: flex;
+	margin: 50rpx 0;
+	align-items: center;
+	&--title{
+		font-size: 28rpx;
+		margin-right: 30rpx;
+	}
+	&--desc{
+		font-size: 30rpx;
+		color: #999;
+		margin-left: 40rpx;
+	}
+}
+.textarea{
+	height: 200rpx;
+	margin-bottom: 40rpx;
+}
+.footer{
+	width: 100%;
+	text-align: right;
+	margin-top: 50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/BsCommentThumbup.vue b/src/components/BsCommentThumbup.vue
new file mode 100644
index 0000000..45b64c5
--- /dev/null
+++ b/src/components/BsCommentThumbup.vue
@@ -0,0 +1,52 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 16:01:19
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-22 16:05:27
+ * @Description: file content
+-->
+<template>
+	<view class="thumb">
+		<view class="thumb--item">
+			<u-icon name="thumb-up"></u-icon>
+			<text>2</text>
+		</view>
+		<view class="thumb--item" @click="$Router.push(`/goodsCommentDetail?id=${commentDetail.id}`)">
+			<u-icon name="chat"></u-icon>
+			<text>{{answerCount}}</text>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	props : {
+		commentDetail : {
+			type : Object,
+			default : ()=>({})
+		}
+	},
+	computed : {
+		answerCount (){
+			const arr = this.commentDetail.answerCommentList || []
+			return arr.length;
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+
+.thumb{
+	display: flex;
+	justify-content: flex-end;
+	margin-top: 40rpx;
+	&--item{
+		display: flex;
+		align-items: center;
+		margin-left: 50rpx;
+		text{
+			font-size: 24rpx;
+			margin-left: 10rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/components/BsCommentUserInfo.vue b/src/components/BsCommentUserInfo.vue
new file mode 100644
index 0000000..55bc6dc
--- /dev/null
+++ b/src/components/BsCommentUserInfo.vue
@@ -0,0 +1,47 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 22:27:52
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-21 22:29:18
+ * @Description: file content
+-->
+<template>
+	<view class="comment-user">
+		<image class="comment-user--avatr" :src="userData.userAvatar" shape="circle"/>
+		<view>
+			<view class="comment-user--name">{{userData.userName}}</view>
+			<text class="comment-user--sku">已购买{{userData.skuName}}</text>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	props : {
+		userData : {
+			type : Object,
+			default : ()=> ({})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+
+.comment-user{
+	display: flex;
+	justify-content: flex-start;
+	&--avatr{
+		width: 71rpx;
+		height: 71rpx;
+		margin-right: 17rpx;
+	}
+	&--name{
+		margin-top: 5rpx;
+	}
+	&--sku{
+		margin-top: 10rpx;
+		font-size: 24rpx;
+		color: #999;
+	}
+}
+	
+</style>
\ No newline at end of file
diff --git a/src/components/UiWhiteBox.vue b/src/components/UiWhiteBox.vue
index f9c26e9..14888cb 100644
--- a/src/components/UiWhiteBox.vue
+++ b/src/components/UiWhiteBox.vue
@@ -2,11 +2,11 @@
  * @Author: ch
  * @Date: 2022-03-31 15:42:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 13:57:30
+ * @LastEditTime: 2022-06-22 14:12:46
  * @Description: file content
 -->
 <template>
-	<view class="ui-white-box">
+	<view class="ui-white-box" @click="$emit('click')">
 		<slot></slot>
 	</view>
 </template>
@@ -14,6 +14,6 @@
 .ui-white-box{
 	margin: 20rpx 30rpx;
 	background: $color-grey0;
-	border-radius: 20rpx;
+	border-radius: 8rpx;
 }
 </style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 80841f9..24f3a39 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2021-07-26 23:22:16
  * @LastEditors: ch
- * @LastEditTime: 2022-06-13 10:15:03
+ * @LastEditTime: 2022-06-20 17:38:48
  * @Description: file content
  */
 import Vue from 'vue';
@@ -13,6 +13,7 @@ import uView from 'uview-ui';
 import store from '@/common/store';
 import {FormatSearchJson} from '@/common/utils';
 import {ApiGetOpenId, ApiGetAuthUrl} from '@/common/api/wx';
+import {ApiGetCurrentUser} from '@/common/api/account';
 import {Im, ImInit} from '@/common/utils';
 import { ApiSktSysGetSession, ApiSktSysHeart } from './common/api/im';
 
@@ -30,11 +31,23 @@ const socketInit = () => {
     });
     
 }
+
+const getUserInfo = async () => {
+    const { error, result } = await ApiGetCurrentUser();
+    if (error) {
+        uni.$u.toast(error.message);
+        return false;
+    }
+    store.commit('SET_USER_INFO', result);
+};
+
 if (store.state.token) {
     socketInit();
+    getUserInfo();
 }
 
 
+
 // 微信打开需要授权
 const ua = navigator ? navigator.userAgent.toLowerCase() : '';  
 if(ua.includes('micromessenger')) {
diff --git a/src/manifest.json b/src/manifest.json
index 0009eb7..0879e64 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -120,10 +120,11 @@
         "devServer" : {
             "proxy" : {
                 "/uc/" : {
-                    "target" : "https://k8s-horse-gateway.mashibing.cn"
+                    // "target" : "https://k8s-horse-gateway.mashibing.cn"
+                    "target" : "http://192.168.10.118:8090"
                 },
                 "/mall/" : {
-                    "target" : "https://k8s-horse-gateway.mashibing.cn"
+                    "target" : "http://192.168.10.118:8090"
                 },
                 "/pay/" : {
                     "target" : "https://k8s-horse-gateway.mashibing.cn"
diff --git a/src/pages.json b/src/pages.json
index 1f98a74..a03df1f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -58,6 +58,38 @@
 				"navigationBarTitleText": "马士兵严选"
 			}
 		},
+		{
+			"path": "pages/goods/comment/list",
+			"aliasPath" : "/goodsCommentList",
+			"style": {
+				"navigationStyle" : "custom",
+				"navigationBarTitleText": "马士兵严选"
+			}
+		},
+		{
+			"path": "pages/goods/comment/otherList",
+			"aliasPath" : "/goodsCommentOtherList",
+			"style": {
+				"navigationStyle" : "custom",
+				"navigationBarTitleText": "马士兵严选"
+			}
+		},
+		{
+			"path": "pages/goods/comment/preview",
+			"aliasPath" : "/goodsCommentPreview",
+			"style": {
+				"navigationStyle" : "custom",
+				"navigationBarTitleText": "马士兵严选"
+			}
+		},
+		{
+			"path": "pages/goods/comment/detail",
+			"aliasPath" : "/goodsCommentDetail",
+			"style": {
+				"navigationStyle" : "custom",
+				"navigationBarTitleText": "马士兵严选"
+			}
+		},
 		{
 			"path": "pages/account/index",
 			"aliasPath" : "/account",
@@ -177,6 +209,27 @@
 				"navigationBarTitleText": "支付中"
 			}
 		},
+		{
+			"path": "pages/order/comment/index/index",
+			"aliasPath" : "/comment",
+			"style": {
+				"navigationBarTitleText": "发表评价"
+			}
+		},
+		{
+			"path": "pages/order/comment/submitFollow",
+			"aliasPath" : "/commentSubmitFollow",
+			"style": {
+				"navigationBarTitleText": "发表追评"
+			}
+		},
+		{
+			"path": "pages/order/comment/success",
+			"aliasPath" : "/commentSuccess",
+			"style": {
+				"navigationBarTitleText": "评价成功"
+			}
+		},
 		{
 			"path": "pages/order/saleAfter/saleAfterList",
 			"aliasPath" : "/saleAfterList",
diff --git a/src/pages/goods/comment/detail.vue b/src/pages/goods/comment/detail.vue
new file mode 100644
index 0000000..d2796b6
--- /dev/null
+++ b/src/pages/goods/comment/detail.vue
@@ -0,0 +1,209 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 18:19:13
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 16:10:21
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="box">
+			<BsCommentUserInfo :userData="detail"/>
+			<BsCommentInfo :commentDetail="detail"/>
+			<BsCommentFollowInfo v-if="detail.followComment" :followComment="detail.followComment" :commentTime="detail.createTime"/>
+			<BsCommentGoodsInfo class="goods-info" :goods="detail"/>
+		</view>
+		<view class="reply-title">全部评论( {{answerCount}}条)</view>
+		<view class="reply">
+			<template v-if="answerCount">
+				<view class="reply--item" v-for="item in detail.answerCommentList" :key="item.id" @click="handleAnswer(item)">
+					<view class="reply--title">
+						<text>
+							{{item.userName}} {{item.parentId !== detail.id ? ` 回复 ${item.parentUserName}` : ''}}
+						</text>
+						<text>{{item.createTime}}</text>
+					</view>
+					<view class="reply--ctx">{{item.commentContent}}</view>
+				</view>
+			</template>
+			<BsEmpty v-else tips="还没有人评论哦，快来抢沙发~"/>
+		</view>
+		<view class="footer">
+			<view v-if="!detail.followComment && detail.userId === $store.state.userInfo.id" 
+				@click="$Router.push(`/commentSubmitFollow?id=${commentId}`)">追评</view>
+			<view @click="isShowAnswer = true">评论</view>
+			<view>有用</view>
+		</view>
+		<template v-if="isShowAnswer" >
+			<view class="reply-comment--bg" @click="handleHideAnswer"></view>
+			<view class="reply-comment">
+				<view class="reply-comment--box">
+					<input class="reply-comment--input" maxlength="500" v-model="commentContent" :placeholder="placeholder" />
+					<UiButton type="gradual" @click="handleSubmit">发表</UiButton>
+				</view>
+			</view>
+		</template>
+	</view>
+</template>
+<script>
+import BsCommentGoodsInfo from '../../../components/BsCommentGoodsInfo.vue'
+import BsCommentInfo from '../../../components/BsCommentInfo.vue'
+import BsCommentUserInfo from '../../../components/BsCommentUserInfo.vue'
+import UiButton from '../../../components/UiButton.vue'
+import {ApiGetCommentDetail, ApiPostComment} from '@/common/api/comment'
+import {HandleApiError} from '@/common/utils'
+import COMMENT from '@/common/dicts/comment'
+import BsEmpty from '../../../components/BsEmpty.vue'
+import BsCommentFollowInfo from '../../../components/BsCommentFollowInfo.vue'
+export default {
+	components: { BsCommentGoodsInfo, BsCommentInfo, UiButton, BsCommentUserInfo, BsEmpty, BsCommentFollowInfo },
+	data(){
+		return {
+			isShowAnswer : false,
+			answer : null,
+			commentId : this.$Route.query.id,
+			detail : {},
+			commentContent : ''
+		}
+	},
+	computed:{
+		placeholder(){
+			return this.answer ? `回复：${this.answer.userName}` : '说点什么吧？'
+		},
+		answerCount(){
+			return this.detail.answerCommentList ? this.detail.answerCommentList.length : 0
+		}
+	},
+	onShow(){
+		this.getDetail();
+	},
+	methods:{
+		
+		async getDetail(){
+			const {error, result} = await ApiGetCommentDetail({
+				commentId : this.commentId
+			});
+			if(!HandleApiError(error,'getDetail')){
+				this.detail = result;
+			}
+		},
+		async handleSubmit(){
+			let data = {
+				commentContent : this.commentContent,
+				commentType : COMMENT.TYPE.ANSWER,
+				// orderProductId : this.detail.orderProductId,
+				originId : this.detail.id,
+				parentId : this.answer ? this.answer.id : this.detail.id
+			}
+			const {error, result} = await ApiPostComment(data);
+			if(!HandleApiError(error,'getDetail')){
+				this.detail.answerCommentList.push({
+					...result, 
+					userName : this.$store.state.userInfo.nickname,
+					parentName: this.answer ? this.answer.userName : ''
+				});
+				this.commentContent = '';
+				uni.$u.toast('评论成功！')
+			}
+		},
+		handleAnswer(item){
+			this.isShowAnswer = true;
+			this.answer = item;
+		},
+		handleHideAnswer(...e){
+			this.isShowAnswer = false;
+			this.answer = null;
+		}
+	}
+}
+</script>
+<style lang="scss">
+page{
+	background: $color-grey1;
+	padding-bottom: 140rpx;
+}
+</style>
+<style lang="scss" scoped>
+.box{
+	background: $color-grey0;
+	padding: 40rpx;
+}
+.goods-info{
+	margin-top: 30rpx;
+	border: 1px solid #f8f8f8;
+}
+.reply-title{
+	height: 70rpx;
+	line-height: 70rpx;
+	margin-bottom:1rpx;
+	margin-top: 20rpx;
+	background: #fff;
+	padding: 0 40rpx;
+}
+.reply{
+	background: #fff;
+	padding: 0 40rpx;
+	overflow: hidden;
+	&--item{
+		border-bottom: 1px solid $color-grey1;
+		padding-top: 40rpx;
+	}
+	&--title{
+		display: flex;
+		justify-content: space-between;
+		text{
+			color: #999;
+		}
+	}
+	&--ctx{
+		margin: 26rpx 0;
+		line-height: 36rpx;
+	}
+}
+.footer{
+	height: 124rpx;
+	position: fixed;
+	bottom: var(--window-bottom);
+	left: 0;
+	right: 0;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	background: #fff;
+	border-top: 1px solid #f8f8f8;
+	
+}
+.reply-comment--bg{
+	position: fixed;
+	bottom: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 1;
+}
+
+.reply-comment{
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 2;
+	background: #fff;
+	height: 124rpx;
+	padding: 24rpx 40rpx;
+	border-top: 1px solid #f8f8f8;
+	&--box{
+		display: flex;
+		background: #F5F5F5;
+		border-radius: 38rpx;
+	}
+	&--input{
+		flex: 1;
+		padding:0 20rpx 0 40rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		
+	}
+}
+
+</style>
\ No newline at end of file
diff --git a/src/pages/goods/comment/list.vue b/src/pages/goods/comment/list.vue
new file mode 100644
index 0000000..f9ea08a
--- /dev/null
+++ b/src/pages/goods/comment/list.vue
@@ -0,0 +1,192 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 16:51:03
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 11:14:27
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="header">
+			<view class="tab">
+				<view class="tab--item" :class="{'tab--item__active' : tabActive == i.labelType}"
+					 v-for="i in tabs" :key="i.labelType" @click="handleChangeTab(i)">
+					 {{i.labelName}}({{i.commentCount}})
+				</view>
+			</view>
+			<view @click="sortChange">
+				<image v-if="timeSortType" class="header--sort" src="@/static/comment/sort_active.png"/>
+				<image v-else class="header--sort" src="@/static/comment/sort.png"/>
+			</view>
+		</view>
+		<view class="comment" v-for="item in list" :key="item.id" @click="$Router.push(`/goodsCommentDetail?id=${item.id}`)">
+			<BsCommentUserInfo :userData="item"/>
+			<BsCommentInfo :commentDetail="item"/>
+			<BsCommentFollowInfo :commentTime="item.createTime" :followComment="item.followComment"/>
+			<BsCommentThumbup :commentDetail="item"/>
+		</view>
+		<u-loadmore :status="loadingStatus" v-if="loadingStatus === 'loading'"/>
+		<view class="other" v-if="otherCount" @click="$Router.push(`/goodsCommentOtherList?id=${productId}`)">
+			已折叠{{otherCount}}条帮助不大的评价
+		</view>
+	</view>
+	
+</template>
+<script>
+import BsCommentInfo from '../../../components/BsCommentInfo.vue'
+import BsCommentUserInfo from '../../../components/BsCommentUserInfo.vue'
+import {ApiGetCommentList, ApiGetCommentCount, ApiGetCommentTabCount} from '@/common/api/comment';
+import {HandleApiError} from '@/common/utils'
+import BsCommentFollowInfo from '../../../components/BsCommentFollowInfo.vue';
+import BsCommentThumbup from '../../../components/BsCommentThumbup.vue';
+export default {
+	components: { BsCommentInfo, BsCommentUserInfo, BsCommentFollowInfo, BsCommentThumbup },
+	data (){
+		return {
+			list : [],
+			pageIndex : 1,
+			pageSize : 10,
+			productId : this.$Route.query.id,
+			loadingStatus : 'loading',
+			otherCount : 0,
+			timeSortType : false,
+			tabActive : -1,
+			tabs : [
+				{
+					labelName : '全部',
+					labelType : -1,
+					commentCount : 0
+				}
+			]
+			
+		}
+	},
+	onLoad(){
+		this.getList();
+		this.getTabCount();
+		this.getCount()
+	},
+	onReachBottom(){
+		this.next();
+	},
+	methods:{
+		async getList(){
+			this.loadingStatus = 'loading';
+			const {error, result} = await ApiGetCommentList({
+				pageIndex : 1,
+				length : this.pageSize,
+				productId : this.productId,
+				commentLabel : this.tabActive == -1 ? null : this.tabActive,
+				sortType : this.timeSortType ? 2 : 1,
+				isContent : true
+			});
+			if(!HandleApiError(error, 'getList')){
+				this.list = result.records;
+				// 标记是否为最后一页
+				if(result.records.length < this.pageSize){
+					this.loadingStatus = 'nomore';
+				}
+			}
+		},
+		async getTabCount (){
+			const {error, result} = await ApiGetCommentTabCount({
+				productId : this.productId
+			});
+			if(!HandleApiError(error, 'getTabCount')){
+				this.tabs = this.tabs.concat(result);
+			}
+		},
+		async getCount(){
+			const {error, result} = await ApiGetCommentCount({
+				productId : this.productId
+			});
+			if(!HandleApiError(error, 'getCount')){
+				this.otherCount = result.defaultCommentCount;
+				this.$set(this.tabs[0],'commentCount', result.allCommentCount)
+			}
+		},
+		calcDay(item, createTime){
+			const followTime = (new Date(item.createTime)).getTime();
+			const commentTime = (new Date(createTime)).getTime();
+			const day = Math.floor((followTime - commentTime) / (24 * 60 * 60 * 1000));
+			return day > 0 ? `${day}天后` : `当天`;
+		},
+		sortChange(){
+			this.timeSortType = !this.timeSortType;
+			this.list = [];
+			this.pageIndex = 1;
+			this.getList();
+		},
+		handleChangeTab(item){
+			this.tabActive = item.labelType;
+			this.pageIndex = 1;
+			this.list = [];
+			this.getList();
+		},
+		next(){
+			if(this.loadingStatus === 'nomore'){
+				return false
+			}
+			this.pageIndex++;
+			this.getList();
+		}
+	}
+}
+</script>
+<style lang="scss">
+page{
+	background: $color-grey1;
+}
+</style>
+<style lang="scss" scoped>
+.header{
+	background: $color-grey0;
+	height: 79rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 0 40rpx;
+	.tab{
+		display: flex;
+		justify-content: flex-start;
+		&--item{
+			font-size: 28rpx;
+			line-height: 75rpx;
+			margin-right: 64rpx;
+			&__active{
+				border-bottom: 4rpx solid $color-yellow3;
+			}
+		}
+	}
+	&--sort{
+		width: 30rpx;
+		height: 30rpx;
+	}
+}
+.comment{
+	margin-top:20rpx ;
+	background: $color-grey0;
+	padding: 40rpx;
+}
+
+.follow{
+	margin-top: 40rpx;
+	&--title{
+		color: $color-yellow3;
+		font-size: 28rpx;
+	}
+	&--ctx{
+		margin-top: 20rpx;
+		font-size: 30rpx;
+		line-height: 46rpx;
+	}
+}
+.other{
+	text-align: center;
+	color: #999;
+	margin: 40rpx 0 20rpx;
+	height: 100rpx;
+	background:url('@/static/common/arrow.png') no-repeat right center;
+	background-size: 10rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/goods/comment/otherList.vue b/src/pages/goods/comment/otherList.vue
new file mode 100644
index 0000000..718b278
--- /dev/null
+++ b/src/pages/goods/comment/otherList.vue
@@ -0,0 +1,105 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 16:51:03
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 10:52:02
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="comment" v-for="item in list" :key="item.id" @click="$Router.push(`/goodsCommentDetail?id${item.id}`)">
+			<BsCommentUserInfo :userData="item"/>
+			<BsCommentInfo :commentDetail="item"/>
+			<BsCommentThumbup :commentDetail="item"/>
+		</view>
+		<u-loadmore :status="loadingStatus" v-if="loadingStatus === 'loading'"/>
+	</view>
+	
+</template>
+<script>
+import BsCommentInfo from '../../../components/BsCommentInfo.vue'
+import BsCommentUserInfo from '../../../components/BsCommentUserInfo.vue'
+import {ApiGetCommentList, ApiGetCommentCount, ApiGetCommentTabCount} from '@/common/api/comment';
+import {HandleApiError} from '@/common/utils'
+export default {
+	components: { BsCommentInfo, BsCommentUserInfo },
+	data (){
+		return {
+			list : [],
+			pageIndex : 1,
+			pageSize : 10,
+			productId : this.$Route.query.id,
+			loadingStatus : 'loading'
+			
+		}
+	},
+	onLoad(){
+		this.getList();
+	},
+	onReachBottom(){
+		this.next();
+	},
+	methods:{
+		async getList(){
+			this.loadingStatus = 'loading';
+			const {error, result} = await ApiGetCommentList({
+				pageIndex : 1,
+				length : this.pageSize,
+				productId : this.productId,
+				sortType : 1,
+				isContent : false
+			});
+			if(!HandleApiError(error, 'getList')){
+				this.list = result.records;
+				// 标记是否为最后一页
+				if(result.records.length < this.pageSize){
+					this.loadingStatus = 'nomore';
+				}
+			}
+		},
+		next(){
+			if(this.loadingStatus === 'nomore'){
+				return false
+			}
+			this.pageIndex++;
+			this.getList();
+		}
+	}
+}
+</script>
+<style lang="scss">
+page{
+	background: $color-grey1;
+}
+</style>
+<style lang="scss" scoped>
+.header{
+	background: $color-grey0;
+	height: 79rpx;
+	display: flex;
+	justify-content: space-between;
+	padding: 0 40rpx;
+	.tab{
+		display: flex;
+		justify-content: flex-start;
+		&--item{
+			font-size: 28rpx;
+			line-height: 75rpx;
+			margin-right: 64rpx;
+			&__active{
+				border-bottom: 4rpx solid $color-yellow3;
+			}
+		}
+	}
+}
+.comment{
+	margin-top:20rpx ;
+	background: $color-grey0;
+	padding: 40rpx;
+}
+.other{
+	text-align: center;
+	color: #999;
+	margin: 40rpx 0 20rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/goods/comment/preview.vue b/src/pages/goods/comment/preview.vue
new file mode 100644
index 0000000..7ccb9cf
--- /dev/null
+++ b/src/pages/goods/comment/preview.vue
@@ -0,0 +1,76 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-22 15:15:22
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 14:23:27
+ * @Description: file content
+-->
+<template>
+	<view class="preview">
+		<view class="preview--top">
+			{{current + 1}}/{{imgs.length}}
+		</view>
+		<u-swiper :list="imgs" :current="current" @change="handleChange" :autoplay="false" />
+		<view class="preview--footer">
+			<BsCommentUserInfo :userData="data"/>
+			<view>
+				<view class="top">
+					<u-rate count="5" size="30rpx" :value="data.commentScore" activeColor="#FFA35B" readonly inactiveColor="#DDD"></u-rate>
+					<text class="top--time">{{ data.createTime }}</text>
+				</view>
+				<view class="ctx">{{ data.commentContent }}</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import BsCommentUserInfo from '@/components/BsCommentUserInfo.vue';
+
+export default {
+	components: { BsCommentUserInfo },
+	data (){
+		return {
+			data : this.$store.state.comment_preview,
+			current : Number(this.$Route.query.idx)
+		}
+	},
+	computed : {
+		imgs(){
+			const arr = this.data.pictureUrl || [];
+			return arr.split(',')
+		}
+	},
+	onShow(){
+		if(!this.data.id){
+			this.$Router.back();
+		}
+	},
+	methods:{
+		handleChange(idx){
+			this.current = idx.current
+		}
+	}
+}
+</script>
+<style lang="scss">
+page{
+	background: #000;
+}
+</style>
+<style lang="scss" scoped>
+
+.preview{
+	&--top{
+		color: #fff;
+		height: 44px;
+		padding: 0 20px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: -webkit-sticky;
+		position: sticky;
+		top: var(--window-top);
+		z-index: 999;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/goods/detail/index.vue b/src/pages/goods/detail/index.vue
index d8b1612..d04331f 100644
--- a/src/pages/goods/detail/index.vue
+++ b/src/pages/goods/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 17:27:21
  * @LastEditors: ch
- * @LastEditTime: 2022-06-02 14:39:30
+ * @LastEditTime: 2022-06-22 22:08:16
  * @Description: file content
 -->
 <template>
@@ -22,14 +22,16 @@
 			</view>
 			<view class="goods-info--title">{{goods.name}}</view>
 		</view>
-		<view class="select">
+		<view class="box">
 			<Service></Service>
 			<u-cell v-if="stock > 0" label="选择" :value="curSku.name || '请选择规格'" :border="false" isLink @click="onShowSkuPopup(1)"></u-cell>
 			<SkuPopup v-model="curSku" :visible.sync="showSkuPopup" :mode="skuMode" 
 				:goodsInfo="goods" :skuInfo="skuInfoData" :activityStatus="activityStatus">
 			</SkuPopup>
 		</view>
-		<view class="goods-desc">
+		
+		<Comment v-if="commentCount" :commentList="commentList" :count="commentCount" :productId="goodsId"/>
+		<view class="box goods-desc">
 			<mp-html :content="goods.detail"/>
 		</view>
 		<view class="footer--not-stock" v-if="stock === 0">商品无库存啦~看看其他的吧</view>
@@ -47,20 +49,23 @@
 </template>
 <script>
 
-import {FormatDate} from '@/common/utils';
+import {FormatDate, HandleApiError} from '@/common/utils';
 import {ApiGetGoodsDetail, ApiGetGoodsSkus} from '@/common/api/goods';
+import {ApiGetCommentList, ApiGetCommentCount} from '@/common/api/comment';
 import SlideImage from './modules/SlideImage.vue';
 import Service from './modules/Service.vue';
 import SkuPopup from './modules/SkuPopup.vue';
 import SeckillPrice from './modules/SeckillPrice.vue';
 import mpHtml from 'mp-html/dist/uni-app/components/mp-html/mp-html';
 import UiButton from '../../../components/UiButton.vue';
+import Comment from './modules/Comment.vue';
 export default {
-	components: { SlideImage, mpHtml, Service, SkuPopup, UiButton, SeckillPrice},
+	components: { SlideImage, mpHtml, Service, SkuPopup, UiButton, SeckillPrice, Comment},
 	data(){
 		return {
 			// 总库存，为了默认不提示无库存，默认值为1
 			stock : 1,
+			goodsId : this.$Route.query.id,
 			goods : {
 				pictureList : []
 			},
@@ -73,7 +78,10 @@ export default {
 				sku : '',
 				num : 1
 			},
-			productActivityVO : {}
+			productActivityVO : {},
+			
+			commentList : [],
+			commentCount : 0
 		}
 	},
 	computed:{
@@ -96,8 +104,7 @@ export default {
 		async getGoodsDetail(){
 			const {query} = this.$Route;
 			const {error, result} = await ApiGetGoodsDetail({id : query.id});
-			if(error){
-				uni.$u.toast(error.message);
+			if(HandleApiError(error, 'getGoodsDetail')){
 				return false;
 			}
 			this.goods = {...result,
@@ -119,22 +126,42 @@ export default {
 				originalPrice:result.startingPrice
 			};
 			this.getGoodsSkus();
+			this.getComment();
+			this.getCommentCount();
 			
 		},
 		async getGoodsSkus(){
-			const {query} = this.$Route;
-			const {error, result} = await ApiGetGoodsSkus({productId : query.id});
-			if(error) {
-				uni.$u.toast(error.message);
-				return false;
+			const {error, result} = await ApiGetGoodsSkus({productId : this.goodsId});
+			if(!HandleApiError(error, 'getGoodsSkus')){
+				// 设置总库存
+				this.stock = 0;
+				this.skuInfoData = result.map(i => {
+					this.stock += i.stock;
+					// i.attributeSymbolList = i.attributeSymbolList.split(',')
+					return i;
+				});
+			}
+			
+		},
+		async getCommentCount (){
+			const {error, result} = await ApiGetCommentCount({
+				productId : this.goods.id
+			});
+			if(!HandleApiError(error, 'getCommentCount')){
+				this.commentCount = result.allCommentCount;
 			}
-			// 设置总库存
-			this.stock = 0;
-			this.skuInfoData = result.map(i => {
-				this.stock += i.stock;
-				// i.attributeSymbolList = i.attributeSymbolList.split(',')
-				return i;
+		},
+		async getComment(){
+			const {error, result} = await ApiGetCommentList({
+				pageIndex : 1,
+				length : 2,
+				productId : this.goods.id,
+				isContent : true,
+				sortType : 1
 			});
+			if(!HandleApiError(error, 'getComment')){
+				this.commentList = result.records;
+			}
 		},
 		/**
 		 * 显示/隐藏SKU弹窗
@@ -206,15 +233,12 @@ page {
 	
 	
 }
-.select{
+.box{
 	margin: 20rpx 30rpx;
 	background: $color-grey0;
 	border-radius: 16rpx;
 }
 .goods-desc{
-	margin: 20rpx 30rpx;
-	background: $color-grey0;
-	border-radius: 16rpx;
 	padding: 20rpx;
 }
 .footer{
diff --git a/src/pages/goods/detail/modules/Comment.vue b/src/pages/goods/detail/modules/Comment.vue
new file mode 100644
index 0000000..05bbd3f
--- /dev/null
+++ b/src/pages/goods/detail/modules/Comment.vue
@@ -0,0 +1,87 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 16:23:27
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 14:30:28
+ * @Description: file content
+-->
+<template>
+
+	<UiWhiteBox @click="handleJumpCmment">
+		<view class="comment-title">
+			<text class="comment-title--left">用户评价({{count}})</text>
+			<text class="comment-title--right">查看全部</text>
+		</view>
+		<view class="comment-ctx" v-if="commentList && commentList.length">
+			<BsCommentInfo class="comment-ctx--item" v-for="item in commentList" 
+				:commentDetail="item" :key="item.id"/>
+		</view>
+		
+	</UiWhiteBox>
+</template>
+<script>
+import BsCommentInfo from '../../../../components/BsCommentInfo.vue'
+import UiCell from '../../../../components/UiCell.vue'
+import UiWhiteBox from '../../../../components/UiWhiteBox.vue'
+export default {
+	components: { BsCommentInfo, UiCell, UiWhiteBox },
+	props : {
+		count : {
+			type : Number,
+			default : 0
+		},
+		productId : {
+			type : Number | String,
+			default : 0
+		},
+		commentList : {
+			type : Array,
+			default : () => ([])
+		}
+	},
+	data(){
+		return {
+		}
+	},
+	methods:{
+		handleJumpCmment(){
+			let url = '/goodsCommentOtherList'
+			if(this.commentList.length){
+				url = '/goodsCommentList'
+			}
+			this.$Router.push({
+				path : url,
+				query : {
+					id : this.productId
+				}
+			})
+		}
+	}
+	
+}
+</script>
+<style lang="scss" scoped>
+.comment-title{
+	display: flex;
+	justify-content: space-between;
+	padding:30rpx;
+	align-items: center;
+	&--left{
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+	&--right{
+		font-size: 24rpx;
+		color: #999;
+		background: url('@/static/common/arrow.png') no-repeat right center;
+		background-size: 10rpx;
+		padding-right: 32rpx;
+	}
+}
+.comment-ctx{
+	padding: 0 30rpx;
+	&--item{
+		padding: 20rpx 0;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 10de30e..48ab4a6 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-06-13 14:25:25
+ * @LastEditTime: 2022-06-22 19:39:05
  * @Description: file content
 -->
 <template>
@@ -108,7 +108,7 @@ export default {
 			const {error, result} = await ApiGetAdList({
 				location : AD_LOCATION.HOME_BANNER
 			});
-			this.bannerList = result;
+			this.bannerList = result || [];
 		},
 		async getSeckillList(){
 			const {error, result} = await ApiGetHomeSeckill();
diff --git a/src/pages/index/modules/Banner.vue b/src/pages/index/modules/Banner.vue
index 65d1351..371e733 100644
--- a/src/pages/index/modules/Banner.vue
+++ b/src/pages/index/modules/Banner.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 10:31:12
  * @LastEditors: ch
- * @LastEditTime: 2022-05-31 17:19:26
+ * @LastEditTime: 2022-06-22 19:38:00
  * @Description: file content
 -->
 <template>
@@ -40,7 +40,7 @@ export default {
 	props:{
 		data : {
 			type : Array,
-			default : []
+			default : ()=>([])
 		}
 	},
 	methods:{
diff --git a/src/pages/order/comment/index/index.vue b/src/pages/order/comment/index/index.vue
new file mode 100644
index 0000000..63f9595
--- /dev/null
+++ b/src/pages/order/comment/index/index.vue
@@ -0,0 +1,122 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-20 14:55:54
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 17:11:51
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="box" v-for="(item, idx) in list" :key="item.productId">
+			<!-- {{item.isEdit}} -->
+			<BsCommentGoodsInfo :goods="item" />
+			<!-- <SubmitComment v-if="!item.id" :commentDetail="item" @submit="submitComment($event,idx)"/> -->
+			
+			<BsCommentSubmit v-if="!item.id" :commentDetail="item" :type="COMMENT.TYPE.COMMENT" 
+				@submit="submitComment($event,idx)" @editChang="editChange($event, idx)"/>
+			<!-- 已评价过显示详情 -->
+			<template v-else>
+				<BsCommentInfo :commentDetail="item"/>
+				<SubmitFollowComment :commentDetail="item" 
+					@submit="submitFollowComment($event, idx)" 
+					@editChange="editChange($event, idx)" />
+				<BsCommentMerchant v-if="item.merchantComment" :merchantComment="item.merchantComment"/>
+				<BsCommentThumbup :commentDetail="item"/>
+			</template>
+		</view>	
+	</view>
+</template>
+<script>
+import { ApiGetOrderCommentDetail } from "@/common/api/comment";
+import UiWhiteBox from "@/components/UiWhiteBox.vue";
+import UiButton from "@/components/UiButton.vue";
+import BsCommentSubmit from "@/components/BsCommentSubmit.vue";
+import BsCommentGoodsInfo from '@/components/BsCommentGoodsInfo.vue';
+import BsCommentInfo from '@/components/BsCommentInfo.vue';
+import BsCommentMerchant from '@/components/BsCommentMerchant.vue';
+import BsCommentThumbup from '@/components/BsCommentThumbup.vue';
+import SubmitFollowComment from './modules/SubmitFollowComment.vue';
+import COMMENT from '@/common/dicts/comment';
+export default {
+	components: {
+		UiWhiteBox,
+		UiButton,
+		BsCommentSubmit,
+		BsCommentGoodsInfo,
+		BsCommentInfo,
+		BsCommentMerchant,
+		BsCommentThumbup,
+		SubmitFollowComment,
+	},
+	data() {
+		return {
+			COMMENT,
+			list: [],
+			orderId: this.$Route.query.orderId,
+			showFollowComment: false,
+		};
+	},
+	onShow() {
+		this.getCommentDetail();
+	},
+	onBackPress(){
+		alert(2222)
+		const flag = this.list.find(i => i.isEdit == true);
+		alert(1111)
+		if(flag){
+			uni.showModal({
+				content : '您正在进行商品评价，退出后评价的内容将不保存',
+				cancelTxt : '我再想想',
+				cancelColor : '#999',
+				confirmColor : '#3A83FB',
+				success: async ({confirm}) => {
+					if(confirm){
+						
+					}
+				}
+			})
+		}
+	},
+	methods: {
+		async getCommentDetail() {
+			const { error, result } = await ApiGetOrderCommentDetail({
+				orderId: this.orderId,
+			});
+			if (error) {
+				uni.$u.toast(error.message);
+				return false;
+			}
+			this.list = result;
+		},
+		submitComment(result, idx){
+			this.$set(this.list, idx, {...this.list[idx],...result});
+		},
+		editChange(isEdit, idx){
+			this.$set(this.list[idx], 'isEdit', isEdit);
+		},
+		submitFollowComment(result, idx){
+			this.$set(this.list[idx],'followComment',{
+				...this.list[idx].followComment,
+				...result
+			});
+			
+		},
+		beforeRouteLeave(to, from, next){
+			console.log(to,from,'beforeRouteLeavebeforeRouteLeave')
+		}
+	},
+};
+</script>
+<style lang="scss">
+page {
+	background: $color-grey1;
+}
+</style>
+<style lang="scss" scoped>
+.box{
+	background: $color-grey0;
+	margin-bottom: 20rpx;
+	padding:40rpx;
+}
+</style>
+
diff --git a/src/pages/order/comment/index/modules/SubmitComment.vue b/src/pages/order/comment/index/modules/SubmitComment.vue
new file mode 100644
index 0000000..d5d2378
--- /dev/null
+++ b/src/pages/order/comment/index/modules/SubmitComment.vue
@@ -0,0 +1,106 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-20 16:36:14
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 11:41:09
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="rate">
+			<text class="rate--title">满意度评分</text>
+			<u-rate :count="5" v-model="rate" size="47rpx" activeColor="#FFA35B" inactiveColor="#DDD"></u-rate>
+			<text class="rate--desc">满意</text>
+		</view>
+		<view>
+			<textarea class="textarea" placeholder="从多个维度评价，可以帮助更多想买的人哦~" 
+				:maxlength="500" v-model="commentContent"></textarea>
+			<u-upload  class="upload" 
+				@afterRead="handleUpdateImg" @delete="handleDelImg" 
+				:fileList="fileList" :maxCount="6" :previewFullImage="true">
+			</u-upload>
+		</view>
+		<view class="footer">
+			<UiButton type="solid" :disable="!rate" @click="handleSubmit">发表评价</UiButton>
+		</view>
+	</view>
+</template>
+<script>
+import UiButton from '@/components/UiButton.vue';
+import {ApiPostComment} from '@/common/api/comment';
+import COMMENT from '@/common/dicts/comment';
+import {uploadFileOss} from '@/common/utils';
+export default {
+	components: { UiButton },
+	props:{
+		commentDetail : {
+			type : Object,
+			default : ()=> ({})
+		}
+	},
+	data(){
+		return {
+			rate : 0,
+			commentContent : '',
+			fileList : []
+		}
+	},
+	methods:{
+		async handleSubmit(){
+			let data = {
+				commentScore : this.rate,
+				commentContent : this.commentContent,
+				commentType : COMMENT.TYPE.COMMENT,
+				orderProductId : this.commentDetail.orderProductId,
+				productId : this.commentDetail.productId,
+				pictureUrl : this.fileList.map(i => i.url).join(',')
+			}
+			const {error, result} = await ApiPostComment(data);
+			if(error){
+				uni.$u.toast(error.message);
+				return false;
+			}
+			this.$emit('submit',result);
+		},
+		async handleUpdateImg(val){
+			const {error, result} = await uploadFileOss(val.file, {
+				configId : 'account-comment',
+				serviceName : 'comment'
+			})
+			if(error){
+				uni.$u.toast(error);
+			}
+			this.fileList.push({url : result});
+		},
+		handleDelImg(target){
+			this.fileList.splice(target.index, 1)
+		}
+	}
+	
+}
+</script>
+<style lang="scss" scoped>
+.rate{
+	display: flex;
+	margin: 50rpx 0;
+	align-items: center;
+	&--title{
+		font-size: 28rpx;
+		margin-right: 30rpx;
+	}
+	&--desc{
+		font-size: 30rpx;
+		color: #999;
+		margin-left: 40rpx;
+	}
+}
+.textarea{
+	height: 200rpx;
+	margin-bottom: 40rpx;
+}
+.footer{
+	width: 100%;
+	text-align: right;
+	margin-top: 50rpx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/order/comment/index/modules/SubmitFollowComment.vue b/src/pages/order/comment/index/modules/SubmitFollowComment.vue
new file mode 100644
index 0000000..6e9ae70
--- /dev/null
+++ b/src/pages/order/comment/index/modules/SubmitFollowComment.vue
@@ -0,0 +1,70 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-20 16:36:41
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 16:46:04
+ * @Description: file content
+-->
+<template>
+		<view class="follow">
+			<BsCommentFollowInfo v-if="commentDetail.followComment" 
+				:followComment="commentDetail.followComment" :commentTime="commentDetail.createTime"/>
+			<template v-else>
+				<UiButton type="primaryLine" @click="showInput = true" v-if="!showInput">发表追评</UiButton>
+				<template v-else>
+					<BsCommentSubmit :commentDetail="commentDetail" :type="COMMENT.TYPE.FOLLOW_COMMENT" 
+						@submit="handleSubmit" @editChang="handleEditChange"/>
+				</template>
+			</template>
+		</view>
+</template>
+<script>
+import UiButton from '@/components/UiButton.vue'
+import BsCommentFollowInfo from '@/components/BsCommentFollowInfo.vue';
+import BsCommentSubmit from '@/components/BsCommentSubmit.vue';
+import COMMENT from '@/common/dicts/comment';
+export default {
+	components: { UiButton, BsCommentFollowInfo, BsCommentSubmit },
+	props : {
+		commentDetail : {
+			type : Object,
+			default : () => ({})
+		}
+	},
+	data(){
+		return { 
+			showInput : false,
+			COMMENT,
+		}
+	},
+	computed:{
+	},
+	methods:{
+		async handleSubmit(data){
+			this.$emit('submit',data);
+		},
+		handleEditChange(data){
+			this.$emit('editChange',data);
+		}
+	}
+	
+}
+</script>
+<style lang="scss" scoped>
+
+.follow{
+	margin-top: 40rpx;
+	&--title{
+		color: $color-yellow3;
+		font-size: 28rpx;
+	}
+	&--ctx{
+		margin-top: 20rpx;
+		font-size: 30rpx;
+		line-height: 46rpx;
+	}
+}
+.footer{
+	text-align: right;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/order/comment/submitFollow.vue b/src/pages/order/comment/submitFollow.vue
new file mode 100644
index 0000000..0ceff01
--- /dev/null
+++ b/src/pages/order/comment/submitFollow.vue
@@ -0,0 +1,156 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 18:19:13
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 16:14:08
+ * @Description: file content
+-->
+<template>
+	<view>
+		<view class="goods-info">
+			<BsCommentGoodsInfo :goods="detail"/>
+		</view>
+		<view class="box">
+			<BsCommentUserInfo :userData="detail"/>
+			<BsCommentInfo :commentDetail="detail"/>
+			<BsCommentSubmit :commentDetail="detail" :type="COMMENT.TYPE.FOLLOW_COMMENT" @submit="handleSubmit"/>
+		</view>
+	</view>
+</template>
+<script>
+import BsCommentGoodsInfo from '../../../components/BsCommentGoodsInfo.vue'
+import BsCommentInfo from '../../../components/BsCommentInfo.vue'
+import BsCommentUserInfo from '../../../components/BsCommentUserInfo.vue'
+import UiButton from '../../../components/UiButton.vue'
+import {ApiGetCommentDetail, ApiPostComment} from '@/common/api/comment'
+import {HandleApiError} from '@/common/utils'
+import COMMENT from '@/common/dicts/comment'
+import BsCommentSubmit from '../../../components/BsCommentSubmit.vue'
+export default {
+	components: { BsCommentGoodsInfo, BsCommentInfo, UiButton, BsCommentUserInfo, BsCommentSubmit },
+	data(){
+		return {
+			COMMENT,
+			isShowAnswer : false,
+			answer : null,
+			commentId : this.$Route.query.id,
+			detail : {},
+			commentContent : ''
+		}
+	},
+	computed:{
+		placeholder(){
+			return this.answer ? `回复：${this.answer.userName}` : '说点什么吧？'
+		},
+		answerCount(){
+			return this.detail.answerCommentList ? this.detail.answerCommentList.length : 0
+		}
+	},
+	mounted(){
+		this.getDetail();
+	},
+	methods:{
+		async getDetail(){
+			const {error, result} = await ApiGetCommentDetail({
+				commentId : this.commentId
+			});
+			if(!HandleApiError(error,'getDetail')){
+				this.detail = result;
+			}
+		},
+		async handleSubmit(){
+			this.$Router.replace('/commentSuccess');
+		},
+	}
+}
+</script>
+<style lang="scss">
+page{
+	background: $color-grey1;
+	padding-bottom: 140rpx;
+}
+</style>
+<style lang="scss" scoped>
+.goods-info{
+	padding: 40rpx 40rpx 0;
+}
+.box{
+	background: $color-grey0;
+	padding: 40rpx;
+	margin-top: 20rpx;
+}
+.reply-title{
+	height: 70rpx;
+	line-height: 70rpx;
+	margin-bottom:1rpx;
+	margin-top: 20rpx;
+	background: #fff;
+	padding: 0 40rpx;
+}
+.reply{
+	background: #fff;
+	padding: 0 40rpx;
+	overflow: hidden;
+	&--item{
+		border-bottom: 1px solid $color-grey1;
+		padding-top: 40rpx;
+	}
+	&--title{
+		display: flex;
+		justify-content: space-between;
+		text{
+			color: #999;
+		}
+	}
+	&--ctx{
+		margin: 26rpx 0;
+		line-height: 36rpx;
+	}
+}
+.footer{
+	height: 124rpx;
+	position: fixed;
+	bottom: var(--window-bottom);
+	left: 0;
+	right: 0;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	background: #fff;
+	border-top: 1px solid #f8f8f8;
+	
+}
+.reply-comment--bg{
+	position: fixed;
+	bottom: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 1;
+}
+
+.reply-comment{
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 2;
+	background: #fff;
+	height: 124rpx;
+	padding: 24rpx 40rpx;
+	border-top: 1px solid #f8f8f8;
+	&--box{
+		display: flex;
+		background: #F5F5F5;
+		border-radius: 38rpx;
+	}
+	&--input{
+		flex: 1;
+		padding:0 20rpx 0 40rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		
+	}
+}
+
+</style>
\ No newline at end of file
diff --git a/src/pages/order/comment/success.vue b/src/pages/order/comment/success.vue
new file mode 100644
index 0000000..9cafb39
--- /dev/null
+++ b/src/pages/order/comment/success.vue
@@ -0,0 +1,119 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-06-21 15:32:28
+ * @LastEditors: ch
+ * @LastEditTime: 2022-06-23 16:56:34
+ * @Description: file content
+-->
+
+<template>
+	<view class="main">
+		<image class="icon" src="@/static/order/paySuccess.png"/>
+		<view class="title">评价成功</view>
+		<view class="btns">
+			<UiButton class="btn" @click="$Router.back()">返回</UiButton>
+		</view>
+		<view class="await">
+			<view class="await--title">这些宝贝还在等你的评价哦~</view>
+			<BsCommentGoodsInfo class="await--goods" :goods="item" v-for="item in goodsList" :key="item.productId">
+				<UiButton slot="btns" size="small" type="primaryLine">评价</UiButton>
+			</BsCommentGoodsInfo>
+		</view>
+		<view class="recommend-title">为您推荐</view>
+		<BsChoiceGoods></BsChoiceGoods>
+	</view>
+</template>
+<script>
+import UiButton from '@/components/UiButton.vue'
+import BsChoiceGoods from '../../../components/BsChoiceGoods.vue';
+import {ApiGetCommentOrderDetailList} from '@/common/api/order';
+import {HandleApiError} from '@/common/utils'
+import BsCommentGoodsInfo from '../../../components/BsCommentGoodsInfo.vue';
+export default {
+	components: { UiButton, BsChoiceGoods, BsCommentGoodsInfo },
+	data(){
+		return { 
+			goodsList : []
+		}
+	},
+	onLoad(){
+		this.getAwaitGoodsList();
+	},
+	methods:{
+		async getAwaitGoodsList (){
+			const  {error, result} = await ApiGetCommentOrderDetailList({
+				length:2,
+				pageIndex : 1
+			});
+			if(!HandleApiError(error, 'getAwaitGoodsList')){
+				this.goodsList = result.map(item => {
+					return {
+						productPicture : item.productImageUrl,
+						productName : item.productName,
+						skuName : item.skuDescribe || '第三课时'
+					}
+				});
+			}
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.main {
+	text-align: center;
+}
+.icon{
+	width: 400rpx;
+	height: 256rpx;
+	margin: 169rpx auto 42rpx;
+}
+.title{
+	font-size: $font-size-lg;
+	line-height: 44rpx;
+	color: $color-grey6;
+}
+.desc{
+	font-size: $font-size-sm;
+	line-height: 34rpx;
+	color: $color-grey4;
+}
+.btns{
+	margin: 74rpx 105rpx 0;
+	display: flex;
+	justify-content: space-between;
+}
+.await{
+	margin-top: 20rpx;
+	background: $color-grey0;
+	&--title{
+		text-align: left;
+		padding: 40rpx;
+		border-bottom: 1px solid #f8f8f8;
+	}
+	&--goods{
+		padding: 20rpx 40rpx;
+		text-align: left;
+	}
+}
+.recommend-title{
+	font-size: $font-size-lg;
+	text-align: center;
+	margin: 51rpx auto 30rpx auto;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	width: 500rpx;
+	&::after,&::before{
+		display: inline-block;
+		content: '';
+		width: 160rpx;
+		height: 2rpx;
+		background: linear-gradient(90deg, $color-grey3 0%, rgba(204, 204, 204, 0) 100%);
+		
+	}
+	&::before{
+		
+		background: linear-gradient(270deg, $color-grey3 0%, rgba(204, 204, 204, 0) 100%);
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/order/detail/index.vue b/src/pages/order/detail/index.vue
index 94d94d8..7016430 100644
--- a/src/pages/order/detail/index.vue
+++ b/src/pages/order/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-05-30 17:46:53
+ * @LastEditTime: 2022-06-22 11:22:41
  * @Description: file content
 -->
 <template>
@@ -29,7 +29,7 @@
 				</template>
 			</UiGoodsInfo>
 		</UiWhiteBox>
-		<LogisitcsInfo v-if="orderInfo.orderType !== ORDER_TYPE.VIRTUAL" 
+		<LogisitcsInfo v-if="orderInfo.orderType !== ORDER.TYPE.VIRTUAL" 
 			:logisitcsInfo="orderInfo.logistics" :orderId="orderInfo.orderId"/>
 		<OrderInfo :orderInfo="orderInfo" />
 		<Operation :orderInfo="orderInfo" v-if="orderInfo.orderStatus !== 3"></Operation>
@@ -44,12 +44,12 @@ import StatusTips from './modules/StatusTips.vue';
 import OrderInfo from './modules/OrderInfo.vue';
 import LogisitcsInfo from './modules/LogisitcsInfo.vue';
 import Operation from './modules/Operation.vue';
-import {ORDER_TYPE} from '@/common/dicts/order'
+import ORDER from '@/common/dicts/order'
 export default {
 	components: { UiGoodsInfo, UiWhiteBox, UiButton, StatusTips, OrderInfo, LogisitcsInfo, Operation },
 	data(){
 		return {
-			ORDER_TYPE,
+			ORDER,
 			orderInfo : {
 				products:[],
 				logistics:{}
@@ -79,7 +79,7 @@ export default {
 			this.getOrderInfo();
 		},
 		handleSaleAfter(item){
-			if(this.orderInfo.orderType === ORDER_TYPE.VIRTUAL){
+			if(this.orderInfo.orderType === ORDER.TYPE.VIRTUAL){
 				uni.$u.toast('虚拟商品的订单不满足退款要求，不支持申请售后，如有问题请联系客服。');
 			}else{
 				this.$Router.push(`/saleAfterSelect?id=${item.orderProductId}`)
diff --git a/src/pages/order/list.vue b/src/pages/order/list.vue
index e07b5de..c70fd6e 100644
--- a/src/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-05-24 09:57:16
+ * @LastEditTime: 2022-06-23 11:11:38
  * @Description: file content
 -->
 <template>
@@ -19,7 +19,7 @@
 		<view class="orders" v-for="item in orderListData" :key="item.orderId">
 			<view class="orders--title">
 				<text class="orders--name">官方自营</text>
-				<text class="orders--status" :class="[1,3].includes(item.orderStatus) && 'orders--status__warn'">{{item.orderStatusDesc}}</text>
+				<text class="orders--status" :class="[ORDER.STATUS.AWAIT_PAY,ORDER.STATUS.FINISH_PAY].includes(item.orderStatus) && 'orders--status__warn'">{{item.orderStatusDesc}}</text>
 			</view>
 			<UiGoodsInfoMax v-for="item in item.products" :key="item.orderProductId" 
 				:data="item" @click="$Router.push(`/orderDetail?id=${item.orderId}`)" />
@@ -32,12 +32,18 @@
 
 			<view class="orders--footer">
 				<UiButton size="min" type="gradual"
-					v-if="item.orderStatus === 1" @click="pay(item)">去支付</UiButton>
-				<UiButton size="min" v-if="[2,3].includes(item.orderStatus)" 
+					v-if="item.orderStatus === ORDER.STATUS.AWAIT_PAY" @click="pay(item)">去支付</UiButton>
+				<UiButton size="min" v-if="[ORDER.STATUS.CLOSE,ORDER.STATUS.AWAIT_PAY].includes(item.orderStatus)" 
 					@click="$Router.push(`/orderDetail?id=${item.orderId}`)">查看详情</UiButton>
-				<UiButton size="min" v-if="item.orderStatus >= 4" 
+				<UiButton size="min" v-if="item.orderStatus >= ORDER.STATUS.FINISH_SEND_GOODS" 
 					@click="$Router.push(`/logisitcsInfo?orderId=${item.orderId}`)">查看物流</UiButton>
-				<UiButton size="min" type="gradual" v-if="item.orderStatus === 4" @click="receive(item)">确认收货</UiButton>
+				<UiButton size="min" type="gradual" 
+					v-if="item.orderStatus === ORDER.STATUS.FINISH_TAKE_GOODS"
+					@click="$Router.push(`/comment?orderId=${item.orderId}`)">去评价</UiButton>
+				<UiButton size="min" type="gradual"
+					v-if="item.orderStatus === ORDER.STATUS.FINISH"
+					@click="$Router.push(`/comment?orderId=${item.orderId}`)">去追评</UiButton>
+				<UiButton size="min" type="gradual" v-if="item.orderStatus === ORDER.STATUS.FINISH_SEND_GOODS" @click="receive(item)">确认收货</UiButton>
 				
 			</view>
 		</view>
@@ -54,17 +60,19 @@ import BsPay from '../../components/BsPay.vue';
 import UiGoodsInfo from '../../components/UiGoodsInfo.vue';
 import UiGoodsInfoMax from '../../components/UiGoodsInfoMax.vue';
 import UiMoney from '../../components/UiMoney.vue';
+import ORDER from '@/common/dicts/order';
 
 export default {
 	components: { BsEmpty, UiButton, BsPay, UiGoodsInfo, UiGoodsInfoMax, UiMoney },
 	data () {
 		return {
+			ORDER,
 			tabListData : [
 				{key : '-1', name : '全部'},
-				{key : '1', name : '待付款'},
-				{key : '3', name : '待发货'},
-				{key : '4', name : '待收货'}
-				// {key : '6', name : '待评价'}
+				{key : ORDER.STATUS.AWAIT_PAY, name : '待付款'},
+				{key : ORDER.STATUS.FINISH_PAY, name : '待发货'},
+				{key : ORDER.STATUS.FINISH_SEND_GOODS, name : '待收货'},
+				{key : ORDER.STATUS.FINISH_TAKE_GOODS, name : '待评价'}
 			],
 			currentTabKey : this.$Route.query.tab || '-1',
 			orderListData : [],
@@ -77,7 +85,7 @@ export default {
 		}
 	},
 	onLoad(){
-		this.getOrderList()
+		this.getOrderList();
 	},
 	onReachBottom(){
 		this.next();
@@ -87,6 +95,9 @@ export default {
 		 * 切换tab 拉取当前分类第一页数据
 		 */
 		changeTab(key){
+			if(this.loadingStatus == 'loading' || this.currentTabKey == key){
+				return false;
+			}
 			this.currentTabKey = key;
 			this.pageIndex = 1;
 			this.orderListData = [];
diff --git a/src/pages/order/logisitcsInfo.vue b/src/pages/order/logisitcsInfo.vue
index af68fb1..74c259c 100644
--- a/src/pages/order/logisitcsInfo.vue
+++ b/src/pages/order/logisitcsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-18 15:28:14
  * @LastEditors: ch
- * @LastEditTime: 2022-06-01 15:34:49
+ * @LastEditTime: 2022-06-22 11:22:21
  * @Description: file content
 -->
 <template>
@@ -11,7 +11,7 @@
 			<UiGoodsInfo :class="idx === orderInfo.products.length-1 ? 'goods-info__last' : ''" :key="item.orderProductId"
 				 v-for="(item, idx) in orderInfo.products" :data="item"></UiGoodsInfo>
 		</UiWhiteBox>
-		<UiWhiteBox class="company" v-if="orderInfo.orderType !== ORDER_TYPE.VIRTUAL">
+		<UiWhiteBox class="company" v-if="orderInfo.orderType !== ORDER.TYPE.VIRTUAL">
 			<text class="company--name">{{orderInfo.companyName}}</text>
 			<view class="company--no">
 				<text>{{orderInfo.trackingNo}}</text>
@@ -38,12 +38,12 @@ import UiGoodsInfo from '@/components/UiGoodsInfo.vue'
 import UiWhiteBox from '@/components/UiWhiteBox.vue'
 import {ApiGetOrderLogistics} from '@/common/api/order';
 import UiCopy from '../../components/UiCopy.vue';
-import {ORDER_TYPE} from '@/common/dicts/order';
+import ORDER from '@/common/dicts/order';
 export default {
 	components: { UiWhiteBox, UiGoodsInfo, UiCopy },
 	data(){
 		return {
-			ORDER_TYPE,
+			ORDER,
 			orderInfo : {}
 		}
 	},
diff --git a/src/pages/order/payResult.vue b/src/pages/order/payResult.vue
index 766d478..9d50a0c 100644
--- a/src/pages/order/payResult.vue
+++ b/src/pages/order/payResult.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-28 15:01:41
  * @LastEditors: ch
- * @LastEditTime: 2022-05-06 10:49:00
+ * @LastEditTime: 2022-06-22 14:53:43
  * @Description: file content
 -->
 
@@ -55,7 +55,7 @@ export default {
 			this.reuqestNum++;
 			const {error, result} = await ApiGetOrderPaySatus({orderId : this.$Route.query.orderId});
 			if(error){
-				uin.$u.toast(error.message);
+				uni.$u.toast(error.message);
 				return false
 			}
 			if(!result.isSuccess && this.reuqestNum < 5){
diff --git a/src/static/comment/sort.png b/src/static/comment/sort.png
new file mode 100644
index 0000000000000000000000000000000000000000..350b88f32de7d4b6b4dbeb3bdb721ab8c8389b4f
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKx3?xrnI^qbV7>k44ofy`glX(f`7zFr)xPoXf
zFa-k>6BA=&V<RIY2m{DQ1CmD=eSmuSOM?7@83Ysz>>UCM8YV0_f8qTH`@`{Pfl@m>
zT^vI!PQSh4$kpT^(*7~O$tcaVJL=jh<`UL}%r6d=K7S=rJf-h}<C!?_;({ZUvkka@
zmG#RvosfUXJhw~6;OGvU7po?US)AB$jdxDx2}wOcZ_5wc?8TlYFX1;&4DMe&qhOW&
ze~smBe;!qwm|I=nHCs)lcuwc39|dRlZnDjj-_(D<c-GaO^)_e2()XN$<8!b2-=F%v
zRa@vO!?KAkbD6JAS`#zttnSis_6_TWL%HiOsxQrBtp4jRumtD_22WQ%mvv4FO#s5!
Bf^Gl+

literal 0
HcmV?d00001

diff --git a/src/static/comment/sort_active.png b/src/static/comment/sort_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..35a6202545645c5ee5db95dee409df7566efef95
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKx3?xrnI^qbV7>k44ofy`glX(f`7zFr)xB}__
z4GI6-BmTEW{cnr>-yZY74Tz#ajP|Ji?a}``fNU7q9?gBys0gTsza+>nm_b0nz}_LC
zpkcy-^B3NKus<As7AUpD)5S5w;`G}qj$BO+BJCgZn~c&-yQ8kHVlH7l$o%3^>GM}2
z#Z&qoIG%~)E-pAyIop8iS6RP&(+T;9%yYYB436%wd9iAun8k@5*Ldf2o{-cN^tSx4
z&0g$j@)CaY#NhtbGYVGO|JPXF_UBQ>iMiGFU9;6>isy8m`cZI(?<U(k`Az-zi)UTk
zS#NVTEPc;8I6n8P|NW`&TeXFrGAx_uGMD+<q%|?K&gw2LXWy`1IF!5oqWaQ2#_GTB
S0!x5?VDNPHb6Mw<&;$Uwua)iq

literal 0
HcmV?d00001