Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test

src/locales/zh-CN/menu.ts

@@ -2,6 +2,10 @@
  * @Author: LeeJiancong
  * @Date: 2020-07-13 14:08:50
 <<<<<<< HEAD
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2020-10-21 14:13:00
+=======
+<<<<<<< HEAD
  * @LastEditors: Please set LastEditors
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -20,6 +24,7 @@
 =======
  * @LastEditTime: 2020-10-26 11:36:19
 >>>>>>> 38b99535... 结算能力对接应付账款，应收账款
+>>>>>>> d77ca7466dfa18de6954ff08d0d11d97fea61cec
  */
 
 export default {

src/pages/lxMall/commodityDetail/index.tsx

@@ -21,7 +21,6 @@ import jinhuodanIcon from '@/assets/imgs/jinhuodan.png'
 import styles from './index.less'
 import { GlobalConfig } from '@/global/config'
 import { isEmpty } from 'lodash'
-
 import { LAYOUT_TYPE, COMMODITY_TYPE, OrderModalType } from '@/constants'
 
 const Logistics_Type = {

src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx

@@ -83,9 +83,9 @@ const EvaluateOrder: React.FC = () => {
       } = item;
 
       return {
-        memberId: orderInfo.createMemberId, 
-        roleId: orderInfo.createRoleId, 
-        memberName: orderInfo.createMemberName || '', 
+        memberId: orderInfo.supplyMembersId, 
+        roleId: orderInfo.supplyMembersRoleId, 
+        memberName: orderInfo.supplyMembersName || '', 
         star, 
         comment, 
         product: JSON.stringify(good), 
@@ -101,7 +101,7 @@ const EvaluateOrder: React.FC = () => {
       };
     });
     
-    PublicApi.postMemberCommentSupplyOrderTradeSubmit({
+    PublicApi.postMemberCommentConsumerOrderTradeSubmit({
       commentSubmitDetailList: payload, 
     }).then(res => {
       if (res.code === 1000) {
@@ -173,7 +173,7 @@ const EvaluateOrder: React.FC = () => {
                   padding: '0 32px', 
                 }}
               >
-                <Descriptions.Item label="采购会员">{orderInfo?.createMemberName}</Descriptions.Item>
+                <Descriptions.Item label="供应会员">{orderInfo?.supplyMembersName}</Descriptions.Item>
                 <Descriptions.Item label="下单时间" span={2}>{orderInfo?.createTime}</Descriptions.Item>
               </Descriptions>
             </PageHeader>

src/pages/transaction/supplierEvaluation/unevaluated/evaluate/schema/index.ts

@@ -72,7 +72,7 @@ export const evaluateSchema: ISchema = {
                       action: '/api/file/file/upload/prefix', 
                       data: {
                         fileType: UPLOAD_TYPE, 
-                        prefix: '/supplierEvaluation/', 
+                        prefix: '/purchaserEvaluation/', 
                       }, 
                       beforeUpload: '{{beforeUpload}}',
                       accept: '.png, .jpg, .jpeg',