Merge branch 'dev' into test

src/pages/comment/manage/index.tsx

@@ -157,7 +157,9 @@ const CommentManage: React.FC = () => {
     confirm({
       title: '提示',
       icon: <QuestionCircleOutlined />,
-      content: '确定要删除选中的评论吗？',
+      content: '确定要删除选中的评论吗？', 
+      okText: '确定', 
+      cancelText: '取消',
       onOk() {
         return new Promise((resolve, reject) => {
           PublicApi.postMemberPlatformCommentOrderTradeHistoryDelete({

src/pages/comment/utils.ts

@@ -2,10 +2,10 @@
  * @Author: XieZhiXiong
  * @Date: 2020-10-20 11:43:12
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-10-20 11:43:21
+ * @LastEditTime: 2020-10-30 14:11:06
  * @Description: 
  */
-import { normalizeFiledata, FileData } from '@/utils';
+import { normalizeFiledata, FileData, isJSONStr } from '@/utils';
 
 export interface Unevaluated {
   good: {
@@ -27,10 +27,11 @@ export function normalizeUnevaluatedList(arr: any): Unevaluated[] {
     return ret;
   }
   arr.forEach(item => {
+    const product = isJSONStr(item.product) || {};
     const atom = {
       good: {
-        pic: item.imgUrl, 
-        productName: item.productName, 
+        pic: product.pic, 
+        productName: product.productName, 
         price: item.price, 
         purchaseCount: item.dealCount,        // 采购数量
       }, 

src/pages/member/memberPr1/index.tsx

@@ -138,7 +138,9 @@ const MemberPr1: React.FC<{}> = props => {
     confirm({
       title: '提示',
       icon: <QuestionCircleOutlined />,
-      content: '确定要审核通过选中的会员吗？',
+      content: '确定要审核通过选中的会员吗？', 
+      okText: '确定', 
+      cancelText: '取消',
       onOk() {
         const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
         return new Promise((resolve, reject) => {

src/pages/member/memberPr2/index.tsx

@@ -138,7 +138,9 @@ const MemberPr2: React.FC<{}> = props => {
     confirm({
       title: '提示',
       icon: <QuestionCircleOutlined />,
-      content: '确定要审核通过选中的会员吗？',
+      content: '确定要审核通过选中的会员吗？', 
+      okText: '确定', 
+      cancelText: '取消',
       onOk() {
         const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
         return new Promise((resolve, reject) => {

src/pages/member/memberPrConfirm/index.tsx

@@ -144,7 +144,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
     confirm({
       title: '提示',
       icon: <QuestionCircleOutlined />,
-      content: '确定要审核通过选中的会员吗？',
+      content: '确定要审核通过选中的会员吗？', 
+      okText: '确定', 
+      cancelText: '取消',
       onOk() {
         const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
         return new Promise((resolve, reject) => {

src/pages/member/memberPrSubmit/index.tsx

@@ -138,7 +138,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
     confirm({
       title: '提示',
       icon: <QuestionCircleOutlined />,
-      content: '确定要审核通过选中的会员吗？',
+      content: '确定要审核通过选中的会员吗？', 
+      okText: '确定', 
+      cancelText: '取消',
       onOk() {
         const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
         return new Promise((resolve, reject) => {