Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

src/pages/comment/manage/detailed/components/EvaluationList/index.tsx

@@ -142,7 +142,10 @@ const EvaluationList = props => {
                   </div>
                   <div className="goodInfo-right">
                     <div className="goodInfo-title">{item.good.productName}</div>
-                    <div className="goodInfo-desc">{item.good.purchaseCount || ''}</div>
+                    <div className="goodInfo-desc">
+                      X {item.good.purchaseCount || ''}
+                      {item.good.unit || ''}
+                    </div>
                     <div className="goodInfo-price">{`¥ ${item.good.price}`}</div>
                   </div>
                 </div>

src/pages/comment/manage/detailed/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-09-23 11:02:03
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-10-26 09:52:13
+ * @LastEditTime: 2020-12-04 11:21:50
  * @Description: 
  */
 import React, { useState, useEffect } from 'react';
@@ -51,7 +51,7 @@ const CommentManageDetailed: React.FC = () => {
     }
     return {
       created: data.dealTime, 
-      orderNo: data.remark, 
+      orderNo: data.orderNo, 
     };
   };
 
@@ -136,7 +136,7 @@ const CommentManageDetailed: React.FC = () => {
           }}
           editable={false}
           expressionScope={{
-            UploadTip,
+            UploadTip: null,
             beforeUpload,
           }}
           onSubmit={() => { }}

src/pages/comment/manage/index.tsx

@@ -215,7 +215,7 @@ const CommentManage: React.FC = () => {
               useStateFilterSearchLinkageEffect(
                 $,
                 actions,
-                'keyword',
+                'product',
                 FORM_FILTER_PATH,
               );
               useAsyncInitSelect(

src/pages/comment/manage/schema/index.tsx

@@ -22,12 +22,12 @@ export const listSearchSchema: ISchema = {
                 children: '{{controllerBtns}}',
               },
             },
-            keyword: {
+            product: {
               type: 'string',
               'x-component': 'Search',
               'x-component-props': {
                 placeholder: '搜索', 
-                tip: '输入 订单号、交易商品 进行搜索', 
+                tip: '输入 交易商品 进行搜索', 
               },
             },
           },

src/pages/comment/query/detailed/components/EvaluationList/index.tsx

@@ -142,7 +142,10 @@ const EvaluationList = props => {
                   </div>
                   <div className="goodInfo-right">
                     <div className="goodInfo-title">{item.good.productName}</div>
-                    <div className="goodInfo-desc">X {item.good.purchaseCount || ''}</div>
+                    <div className="goodInfo-desc">
+                      X {item.good.purchaseCount || ''}
+                      {item.good.unit || ''}
+                    </div>
                     <div className="goodInfo-price">{`¥ ${item.good.price}`}</div>
                   </div>
                 </div>

src/pages/comment/query/detailed/index.tsx

@@ -155,17 +155,16 @@ const CommentDetailed: React.FC = () => {
           const { data, totalCount } = res.data;
           resolve({
             data: data.map(item => {
-              const product = isJSONStr(item.product) || {};
               return {
                 id: item.id, 
                 star: item.star, 
                 comment: item.comment, 
-                productName: product.productName || '', 
-                price: product.price, 
-                quantity: product.purchaseCount, 
+                productName: item.product || '', 
+                price: item.price, 
+                quantity: item.purchaseCount, 
                 created: item.createTime, 
                 target: item.byMemberName, 
-                orderId: product.orderId, 
+                orderId: item.orderId, 
               };
             }),
             totalCount, 

src/pages/comment/utils.ts

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