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

src/pages/home/components/LatestAnnounces/index.less

@@ -3,6 +3,8 @@
   background-color: #fff;
   border-radius: 8px;
   height: 361px;
+  overflow-y: scroll;
+
   .header {
     display: flex;
     flex-direction: row;
@@ -32,7 +34,7 @@
 
       .date {
         margin-right: 16px;
-        padding: 2px 6px;
+        // padding: 2px 6px;
         display: flex;
         flex-direction: column;
         text-align: center;

src/pages/transaction/dealAbility/inquiryOffer/inquirySearch/index.tsx

 import React, { useRef } from 'react';
 import Table from '@/pages/transaction/components/tableLayout';
 import { history } from 'umi';
-import { Tag, Button } from 'antd';
+import { Tag, Button, Modal } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment';
@@ -31,7 +31,7 @@ const InquirySearch = () => {
       setTimeout(() => {
         window.location.replace(`/memberCenter/tranactionAbility/productInquiry/waitAddInquiry/two?id=${id}`);
       }, 800);
-    }).catch(err => {})
+    }).catch(err => { })
   }
 
   const columns: ColumnType<any>[] = [
@@ -84,9 +84,19 @@ const InquirySearch = () => {
         {record.isShowQuote && (
           <Button onClick={() => history.push(`/memberCenter/tranactionAbility/inquiryOffer/waitAddOffer/offer?id=${record.id}`)} type='link'>报价</Button>
         )}
-        {(record.isShowSecondInquiry) && (
+        {(record.isShowSecondInquiry === true) && (
           <Button type='link' onClick={() => secondInquiry(record.id)}>二次询价</Button>
         )}
+        {(record.isShowSecondInquiry === false) && (
+          <Button
+            type='link'
+            onClick={() => Modal.info({
+              content: '当前询价单商品中存在不同的上游供应商不可直接转二次询价，请手工进行询价!'
+            })}
+          >
+            二次询价
+          </Button>
+        )}
       </>
     }
   ];

src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/remind.ts

@@ -13,13 +13,13 @@ export type RemindLayoutProps = {
 
 export const remindLayout = (int, giveType?, giftType?) => {
   const give = (giveType === 1 ? '满额': '买商品');
-  const gift = (giftType === 1 ? '赠商品' : '赠优惠券');
+  const gift = (giftType === 1 ? '商品' : '优惠券');
   switch(int) {
     case 6:
       return {
         type: 'limitValue',
-        modalTitle: `设置赠品-${give}${gift}`,
-        buttonTitle: '添加赠送商品',
+        modalTitle: `设置赠品-${give}赠${gift}`,
+        buttonTitle: `添加赠送${gift}`,
         listTitle: `${give}${gift}`,
         label: {
           1: '优惠门槛',