利率名称 对应写死

mock/main.ts

@@ -117,7 +117,7 @@ export default [
               "mineProduct": (index + 1) % 3 === 0,
               "realBuyJumpUrl": `https://www.baidu.com?t=${(index + 1)}`,
               "rate": 502, // 利率（需要除100展示）	
-              "rateName": `年化收益率${index + 1}`, // 利率名称
+              "type": index === 0 ? '0' : '1', // 产品类型(0-非现金，1-现金)
             }
           }),
           "codeList": [

src/AppTools.ts

@@ -19,6 +19,14 @@ export const PRODUCT_TYPE = {
     CASH: 1,
 }
 
+/** 产品类型 */
+export const RATE_NAME = {
+    /** 非现金 */
+    [PRODUCT_TYPE.NON_CASH]: '年化收益率1TODO',
+    /** 现金 */
+    [PRODUCT_TYPE.CASH]: '年化收益率2TODO',
+}
+
 /** 渠道 */
 export const CHANNEL = {
     /** 华夏理财 */

src/pages/HomePage/HomePage.less

@@ -258,7 +258,7 @@
       .sparkBg("homePage/sign_section_bg.png");
     }
     .sign_tips {
-      width: 334px;
+      width: 434px;
       height: 24px;
       left: 29px;
       top: 89px;

src/pages/HomePage/HomePage.tsx

@@ -8,7 +8,7 @@ import { PageCtrl } from '@/core/ctrls/PageCtrl';
 import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
 import { _asyncThrottle, formatThousand } from '@/utils/utils';
 import RecordPage from '../RecordPage/RecordPage';
-import { diffJump } from '@/AppTools';
+import { diffJump, RATE_NAME } from '@/AppTools';
 import API from '@/api';
 import DetailPage from '../DetailPage/DetailPage';
 import ResPage from '../ResPage/ResPage';
@@ -201,7 +201,7 @@ class HomePage extends React.Component<any, any> {
             </div>
           </div>}
           {/* 推荐产品 */}
-          <div className="recommend_products">
+          {!!rProductList?.length && <div className="recommend_products">
             <span className="r_products_title"></span>
             <div className="r_products_list">
               {rProductList?.map((item, index) => (
@@ -217,7 +217,7 @@ class HomePage extends React.Component<any, any> {
                 </div>
               ))}
             </div>
-          </div>
+          </div>}
           <div className="bottom_products">
             {curTab == 1 && <span className="tab1_bg"></span>}
             {curTab == 2 && <span className="tab2_bg"></span>}
@@ -228,8 +228,8 @@ class HomePage extends React.Component<any, any> {
                 <div className="b_product_item" key={`r_prdct_${index}`} onClick={() => this.jumpRealDetailHandle(item.realBuyJumpUrl)}>
                   <span className="b_product_name">{item.name}</span>
                   <div className="b_product_rate">
-                    <span className="b_product_rate_value">{(item.rate / 100).toFixed(2)}%</span>
-                    <span className="b_product_rate_label">{item.rateName}</span>
+                    {item.rate && <span className="b_product_rate_value">{(item.rate / 100).toFixed(2)}%</span>}
+                    <span className="b_product_rate_label">{RATE_NAME[item.type] || '年化收益率'}</span>
                   </div>
                   <div className="b_product_shu">
                     <span className="b_product_shu_value">{item.shenShuGuiZei}</span>

src/panels/firstPop/firstPop.jsx

@@ -21,10 +21,10 @@ class FirstPop extends React.Component {
 
   // 确认提交  
   handleSubmit = _asyncThrottle(() => {
-    const { agreementText } = this.props || {};
+    const { notifyText } = this.props || {};
 
-    if (!!agreementText && !this.state.privacyChecked) {  // 未勾选隐私协议
-      Toast.show(`请先勾选${agreementText}`)
+    if (!!notifyText && !this.state.privacyChecked) {  // 未勾选隐私协议
+      Toast.show(`请先勾选${notifyText}`)
       return false
     }
     ModalCtrl.closeModal()
@@ -37,15 +37,15 @@ class FirstPop extends React.Component {
   render() {
     const { privacyChecked } = this.state;
 
-    const { experienceNum, agreementText } = this.props || {};
+    const { experienceNum, notifyText } = this.props || {};
     return (<>
       <div className="firstPop modal_center">
         <span className="bg"></span>
         <span className="title">理财体验金</span>
         <div className="amount">{formatThousand(experienceNum)}<span className="unit">元</span></div>
-        {!!agreementText && <div className="check_box">
+        {!!notifyText && <div className="check_box">
           <div className={`check_icon ${privacyChecked ? 'checked' : ''}`} onClick={() => this.setState({ privacyChecked: !this.state.privacyChecked })}></div>
-          <div className="check_text">{agreementText}</div>
+          <div className="check_text">{notifyText}</div>
         </div>}
         <Button className="happy_btn" onClick={this.handleSubmit}></Button>
         <Button className="close" onClick={this.close}></Button>

src/store/store.ts

@@ -69,7 +69,7 @@ class Store {
     }>,
     // 首次体验金弹窗
     firstMoneyPop?: {
-      agreementText?: string,
+      notifyText?: string,
       experienceNum?: number,
     },
     // 模拟资产
@@ -105,7 +105,7 @@ class Store {
       realBuyJumpUrl?: string,
       mineProduct?: boolean, // 我的产品(true是)
       rate?: number, // 利率（需要除100展示）	
-      rateName?: string, // 利率名称
+      type?: string, // 产品类型(0-非现金，1-现金)
     }>,
     // 待存储产品code
     codeList?: Array<{