feat:merge

src/MD.ts

@@ -29,20 +29,20 @@ MDAuto({
   click: MDList, // 点击
 });
 
-export function handleLogExposure(id: number | string, id2: number | string = 1) {
+export function handleLogExposure(id: number | string, id2: number | string = 1, id3: number | string = 0) {
   logExposure({
     dpm: `${appId}.110.${id}.${id2}`,
-    dcm,
+    dcm: `202.${CFG.projectId}.0.${id3}`,
     dom,
     domain,
     appId,
   });
 }
 
-export function handleLogClick(id: number | string, id2: number | string = 1) {
+export function handleLogClick(id: number | string, id2: number | string = 1, id3: number | string = 0) {
   logClick({
     dpm: `${appId}.110.${id}.${id2}`,
-    dcm,
+    dcm: `202.${CFG.projectId}.0.${id3}`,
     dom,
     domain,
     appId,
@@ -67,4 +67,4 @@ export function handleTaskLogExposure(id, id2 = 1, btnStatus) {
     domain,
     appId,
   });
-}
\ No newline at end of file
+}

src/pages/DetailPage/DetailPage.tsx

@@ -261,12 +261,12 @@ class DetailPage extends React.Component<any, any> {
                     </div>
                     <div className={styles.btnArea}>
                         <Button
-                            className={classNames(styles.btn, styles.simulate, "md9")}
+                            className={classNames(styles.btn, styles.simulate, "md18")}
                             onClick={this.clickSimulateBuy}
                         >模拟买入</Button>
 
                         <Button
-                            className={classNames(styles.btn, styles.really, "md10")}
+                            className={classNames(styles.btn, styles.really, "md17")}
                             onClick={this.clickReallyBuy}
                         >真实买入</Button>
                     </div>
@@ -298,7 +298,7 @@ class DetailPage extends React.Component<any, any> {
                     <div className={styles.tip}>{"  "}</div>
                     <div className={styles.btnArea}>
                         <Button
-                            className={classNames(styles.btn, styles.simulate, "md13")}
+                            className={classNames(styles.btn, styles.simulate, 'md16')}
                             style={{ width: "100%" }}
                             onClick={this.clickSimulateSell}
                         >模拟赎回</Button>

src/pages/ResPage/TurnTable/TurnTable.tsx

@@ -28,9 +28,9 @@ class TurnTable extends React.Component {
         resStore.updateInfo();
 
         if (this.drawResultInfo.prizeId == "thanks") {
-            ModalCtrl.showModal(NoPrizePanel, this.drawResultInfo);
+            ModalCtrl.showModal(NoPrizePanel, {...this.drawResultInfo, md: '34'});
         } else {
-            ModalCtrl.showModal(PrizePanel, this.drawResultInfo);
+            ModalCtrl.showModal(PrizePanel, {...this.drawResultInfo, md: '33'});
         }
     }
 
@@ -88,7 +88,7 @@ class TurnTable extends React.Component {
                 didStop={this.onStop}
             />
 
-            <Button className={classNames("drawBtn md17", {
+            <Button className={classNames("drawBtn md32", {
                 enable: remainDrawTime > 0,
                 disable: remainDrawTime <= 0,
             })} onClick={this.drawHandle}/>

src/panels/BuyPanel/BuyPanel.tsx

@@ -24,8 +24,8 @@ export class BuyPanel extends Component<any, any> {
         return <div className="BuyPanel modal_center">
             <div className="bg"/>
             <div className="tip">您申请模拟购买{name}产品{amount}元</div>
-            <Button className="btn md12" onClick={this.clickOk}/>
-            <Button className="cancel md11" onClick={this.clickClose}/>
+            <Button className="btn md20" onClick={this.clickOk}/>
+            <Button className="cancel md19" onClick={this.clickClose}/>
             <Button className="close" onClick={this.clickClose}/>
         </div>
     }

src/panels/NoPrizePanel/NoPrizePanel.tsx

@@ -15,11 +15,11 @@ export class NoPrizePanel extends Component<any, any> {
 
     render() {
 
-        const {type} = this.props;
+        const {type, md} = this.props;
 
         return <div className="NoPrizePanel modal_center">
             <div className="bg"/>
-            <Button className={`btn md${type == 'red' ? '27' : '19'}`} onClick={this.clickClose}/>
+            <Button className={`btn md${type == 'red' ? '27' : md || '19'}`} onClick={this.clickClose}/>
             <Button className="close" onClick={this.clickClose}/>
         </div>
     }

src/panels/PrizePanel/PrizePanel.tsx

@@ -28,14 +28,14 @@ export class PrizePanel extends Component<any, any> {
 
     render() {
 
-        const {optionImg, optionName, type} = this.props;
+        const {optionImg, optionName, type, md} = this.props;
 
         return <div className="PrizePanel modal_center">
             {type != 'red' && <div className="bg"/>}
             {type == 'red' && <div className="bg2"/>}
             <img className="img" src={optionImg}/>
             <div className="prizeName">{optionName}</div>
-            <Button className={`btn md${type == 'red' ? '26' : '18'}`}onClick={this.clickBtn}/>
+            <Button className={`btn md${type == 'red' ? '26' : md || '18'}`}onClick={this.clickBtn}/>
             <Button className="close" onClick={this.clickClose}/>
         </div>
     }

src/panels/SellPanel/SellPanel.tsx

@@ -24,8 +24,8 @@ export class SellPanel extends Component<any, any> {
         return <div className="SellPanel modal_center">
             <div className="bg"/>
             <div className="tip">您申请模拟赎回{name}产品{amount}份</div>
-            <Button className="btn md15" onClick={this.clickOk}/>
-            <Button className="cancel md14" onClick={this.clickClose}/>
+            <Button className="btn md22" onClick={this.clickOk}/>
+            <Button className="cancel md21" onClick={this.clickClose}/>
             <Button className="close" onClick={this.clickClose}/>
         </div>
     }

src/panels/firstPop/firstPop.jsx

@@ -47,7 +47,7 @@ class FirstPop extends React.Component {
           <div className={`check_icon ${privacyChecked ? 'checked' : ''}`} onClick={() => this.setState({ privacyChecked: !this.state.privacyChecked })}></div>
           <div className="check_text">{notifyText}</div>
         </div>}
-        <Button className="happy_btn md2" onClick={this.handleSubmit}></Button>
+        <Button className="happy_btn md3" onClick={this.handleSubmit}></Button>
         <Button className="close" onClick={this.close}></Button>
       </div>
     </>);

src/panels/jumpConfirmPop/jumpConfirmPop.jsx

@@ -20,7 +20,7 @@ class JumpConfirmPop extends React.Component {
   handleClose = _asyncThrottle(() => {
     ModalCtrl.closeModal()
   })
-  
+
   handleConfirm = _asyncThrottle(() => {
     ModalCtrl.closeModal()
     this.props.confirmCb?.()
@@ -31,8 +31,8 @@ class JumpConfirmPop extends React.Component {
       <div className="jumpConfirmPop modal_center">
         <span className="bg"></span>
         <div className="text">离开模拟理财功能<br />前往真实理财产品交易页面</div>
-        <Button className="think_btn" onClick={this.handleClose} />
-        <Button className="confirm_btn" onClick={this.handleConfirm} />
+        <Button className="think_btn md23" onClick={this.handleClose} />
+        <Button className="confirm_btn md24" onClick={this.handleConfirm} />
         <Button className="close" onClick={this.handleClose} />
       </div>
     );

src/panels/loginpop/loginpop.jsx

@@ -180,6 +180,8 @@ class Loginpop extends React.Component {
     const { loginPhone, loginCode, showCountDown, countDown, showSendAgain, showSend } = this.state;
     const { showPrivacyPop, privacyChecked } = this.state;
 
+    const {md} = this.props;
+
     const { agreementTitle, agreementText } = this.state.agreementInfo || {};
     return (<>
       <div className={`loginpop modal_center ${!agreementTitle ? 'no_check' : ''}`}>
@@ -215,7 +217,7 @@ class Loginpop extends React.Component {
             <span className="content_title" onClick={() => this.setState({ showPrivacyPop: true })} dangerouslySetInnerHTML={{ __html: agreementTitle }}></span>
           </div>
         </div>}
-        <Button className={`btn md3 ${getUrlParam("off") == 1 ? 'enter_btn' : ''}`} onClick={this.handleSubmit}></Button>
+        <Button className={`btn md${md} ${getUrlParam("off") == 1 ? 'enter_btn' : ''}`} onClick={this.handleSubmit}></Button>
          {/* <Button className="close" onClick={this.close}></Button> */}
       </div>
 

src/panels/newbieModal/newbieModal.tsx

@@ -28,9 +28,9 @@ export class NewbieModal extends Component<any, any> {
         // resStore.updateInfo();
         ModalCtrl.closeModal();
         if (this.drawResultInfo?.prizeId == "thanks" || !this.drawResultInfo?.prizeId) {
-            ModalCtrl.showModal(NoPrizePanel, this.drawResultInfo);
+            ModalCtrl.showModal(NoPrizePanel, {...this.drawResultInfo, md: '15'});
         } else {
-            ModalCtrl.showModal(PrizePanel, {optionImg: this.drawResultInfo?.prizeImg, optionName: this.drawResultInfo?.prizeName});
+            ModalCtrl.showModal(PrizePanel, {optionImg: this.drawResultInfo?.prizeImg, optionName: this.drawResultInfo?.prizeName, md: '14'});
         }
     }
 

src/panels/taskPanel/index.jsx

@@ -10,7 +10,7 @@ import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
 import SignCom from './signCom/signCom';
 import API from '@/api';
 import taskStore from '@/store/task';
-import { handleTaskLogClick } from '@/MD';
+import { handleLogExposure, handleTaskLogClick } from '@/MD';
 
 @observer
 class TaskPanel extends React.Component {
@@ -20,8 +20,18 @@ class TaskPanel extends React.Component {
       taskList: []
     }
   }
-  componentDidMount() {
-    taskStore.queryTaskInfo();
+  async componentDidMount() {
+    await taskStore.queryTaskInfo();
+
+    taskStore.taskList.map((item, index) => {
+      if(item.taskStatus == 0) {
+        handleLogExposure(28, item?.id, 1)
+      }
+
+      if(item.taskStatus == 1) {
+        handleLogExposure(28, item?.id, 2)
+      }
+    })
   }
   // getTaskList = _asyncThrottle(async () => {
   //   const { success, data } = await API.getTaskList();

src/panels/tipspop/tipspop.jsx

@@ -55,7 +55,7 @@ class Tipspop extends React.Component {
         <div className="code_bg">
           <img className="code_img" src={this.state.qrcode} alt="" />
         </div>
-        <Button className="btn" onClick={this.closeHandle}></Button>
+        <Button className="btn md35" onClick={this.closeHandle}></Button>
         <Button className="close" onClick={this.closeHandle}></Button>
       </div>
     );

src/store/store.ts

@@ -150,9 +150,9 @@ class Store {
       ModalCtrl.showModal(InvalidPop);
     } else if (code == 60002) {
       // 请绑定手机号
-      ModalCtrl.showModal(Loginpop)
+      ModalCtrl.showModal(Loginpop, {md: '2'})
     } else if ((isWeiXin() || CFG.channel == CHANNEL.HXLC) && (code == 100001 || code == 100007 || code == 100009)) {
-      ModalCtrl.showModal(Loginpop);
+      ModalCtrl.showModal(Loginpop, {md: '36'});
     } else {
       Toast.show(message || '网络异常，请稍后再试')
     }

src/store/task.js

@@ -25,15 +25,15 @@ const taskStore = makeAutoObservable({
             const arr2 = data.item.filter((el) => { return Number(el.taskStatus) === 0; });
             const arr3 = data.item.filter((el) => { return Number(el.taskStatus) === 2; });
             this.taskList = arr1.concat(arr2, arr3);
-            this.taskList.forEach(el => {
-                const { code } = el;
-                if (el.taskStatus == 0) {
-                    handleTaskLogExposure(28, code, 1);
-                }
-                if (el.taskStatus == 1) {
-                    handleTaskLogExposure(28, code, 2);
-                }
-            });
+            // this.taskList.forEach(el => {
+            //     const { code } = el;
+            //     if (el.taskStatus == 0) {
+            //         handleTaskLogExposure(28, code, 1);
+            //     }
+            //     if (el.taskStatus == 1) {
+            //         handleTaskLogExposure(28, code, 2);
+            //     }
+            // });
         }
     },